From f6fa2c96776d88a626cb1239200a13c17916c203 Mon Sep 17 00:00:00 2001 From: Andrew Kuck Date: Tue, 3 Mar 2020 13:46:32 -0600 Subject: [PATCH] GPSTk v3.1.0 --- .gitlab-ci.yml | 4 ++++ CMakeLists.txt | 2 +- ChangeLog.md | 49 +++++++++++++++++++++++++++++++++++++++++++++ Doxyfile | 2 +- NEWS.md | 2 ++ debian/changelog | 6 ++++++ debian/control | 10 ++++----- swig/sphinx/conf.py | 4 ++-- 8 files changed, 70 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9c7ad1c1..b5cd0f445 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -356,6 +356,7 @@ package_redhat_py36: refs: - master - /^ci_.*$/ + - /^version_.*_prep$/ script: - mkdir build - pushd build @@ -401,6 +402,7 @@ deploy_debian: refs: - master - /^ci_.*$/ + - /^version_.*_prep$/ script: - cd debs - sudo apt-get -y install ./*.deb @@ -418,6 +420,7 @@ deploy_redhat: refs: - master - /^ci_.*$/ + - /^version_.*_prep$/ script: - cd build/rpm_files/RPMS/x86_64/ - sudo yum install gpstk-*.rpm -y @@ -435,6 +438,7 @@ deploy_redhat_py36: refs: - master - /^ci_.*$/ + - /^version_.*_prep$/ script: - cd build/rpm_files/RPMS/x86_64/ - sudo yum install gpstk_py36-*.rpm -y diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b248941b..e42e64933 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required( VERSION 2.8.5 ) project( GPSTK ) set( GPSTK_VERSION_MAJOR "3" ) -set( GPSTK_VERSION_MINOR "0" ) +set( GPSTK_VERSION_MINOR "1" ) set( GPSTK_VERSION_PATCH "0" ) set( GPSTK_VERSION "${GPSTK_VERSION_MAJOR}.${GPSTK_VERSION_MINOR}.${GPSTK_VERSION_PATCH}" ) diff --git a/ChangeLog.md b/ChangeLog.md index e7a2a12bd..57c7e7ac6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,52 @@ +Version 3.1.0 Tuesday March 03, 2020 + + Modifications by Author + Andrew Kuck (8): + Try to ensure we get the proper python-exe base. + Add CentOS7 Py36 build stage. + Cleanup + Use python3-config to get library name[ + Use REGEX capture groups everywhere. + Fix bad libname. + Allow building all stages if on version_prep branch + Updated Release Notes. + + Andy Kuck (1): + Merge branch 'ci_new_stages' into 'master' + + Bryan Parsons (9): + Merge branch 'version3_stable' into 'master' + Adding back empty deprecated folder. + SWIG wrapping OrbAlmStore for issue 401 changes. + Merge branch 'issue_401_OrbAlm' into 'master' + Adding Windows Back into CI + Merge branch 'ci_windows' into 'master' + Merge branch 'issue_407' into 'master' + Merge branch 'py36_build_update' into 'master' + First pass at switching to Py36 as default in CI. Also added User and System install stages. Commented out Deploy stage until Package installation stage is finished. + + johnk (3): + add reasonTerse and reasonVerbose methods to NavFilter to support filters that perform multiple checks + Add classes for abstracting nav data when using the NavFilter frameworks + Merge remote-tracking branch 'origin/master' into issue_407 + + renfrob (13): + Adding OrbAlm generation to YumaData + Adding tests cases for YumaBase, YumaData, YumaStream + Cleaning up Yuma_T test execution + Removing misplaced test file + Adding test case for SEM almanac handling + Adding OrbElem construction operator + Changing filenames for test case + Cleaning up debug, adding another error trap. + Adding method to support existing downstream code. + Adding test for non-Yuma data + Adding getSatIDList(), omitting elements with no known xmit ID. + Merge branch 'master' into issue_401_OrbAlm + Fixing header read problem in which Toa was truncated + + ################################################# + Version 3.0.0 Tuesday, February 11, 2020 Modifications by Author diff --git a/Doxyfile b/Doxyfile index 0ad49bae6..b00fdde50 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = "GPS ToolKit Software Library" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.0.0 +PROJECT_NUMBER = 3.1.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/NEWS.md b/NEWS.md index 38219a7cf..01f47cb1c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,8 @@ NEWS GPS Toolkit News ------------------------------------------------------------------------------ + March 03, 2020 Release Candidate for Version 3.1.0 is frozen in the + repository February 11, 2020 . . Release Candidate for Version 3.0.0 is frozen in the repository diff --git a/debian/changelog b/debian/changelog index 2c8460cbe..8fb367291 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gpstk (3.1.0-1) stable; urgency=low + + * Updated to version 3.1.0 + + -- Andrew Kuck Tue, 03 Mar 2020 13:34:46 -0600 + gpstk (3.0.0-1) stable; urgency=medium * Build for stretch diff --git a/debian/control b/debian/control index 650a48467..5ab5ef954 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: https://github.com/SGL-UT/GPSTk.git Package: gpstk-bin Architecture: any -Depends: libgpstk3.0 (>= ${binary:Version}), python-gpstk, ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} +Depends: libgpstk3.1 (>= ${binary:Version}), python-gpstk, ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} Description: GPS Toolkit (GPSTk) - command line tools The GPS Toolkit (GPSTk) is an open-source (LGPL) project sponsored by the Space and Geophysics Laboratory (SGL), part of the Applied Research @@ -24,7 +24,7 @@ Description: GPS Toolkit (GPSTk) - command line tools Package: libgpstk-dev Section: libdevel Architecture: any -Depends: libgpstk3.0 (= ${binary:Version}), ${misc:Depends} +Depends: libgpstk3.1 (= ${binary:Version}), ${misc:Depends} Description: GPS Toolkit (GPSTk) - Headers The GPS Toolkit (GPSTk) is an open-source (LGPL) project sponsored by the Space and Geophysics Laboratory (SGL), part of the Applied Research @@ -33,7 +33,7 @@ Description: GPS Toolkit (GPSTk) - Headers * provide applications for use by the GNSS and satellite navigation community. * provide a core library to facilitate the development of GNSS applications. -Package: libgpstk3.0 +Package: libgpstk3.1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: GPS Toolkit (GPSTk) - Shared Libraries @@ -44,11 +44,11 @@ Description: GPS Toolkit (GPSTk) - Shared Libraries * provide applications for use by the GNSS and satellite navigation community. * provide a core library to facilitate the development of GNSS applications. -Package: libgpstk3.0-dbg +Package: libgpstk3.1-dbg Architecture: any Section: debug Priority: extra -Depends: libgpstk3.0 (= ${binary:Version}), ${misc:Depends} +Depends: libgpstk3.1 (= ${binary:Version}), ${misc:Depends} Description: GPS Toolkit (GPSTk) - Shared Library Debugging Symbols The GPS Toolkit (GPSTk) is an open-source (LGPL) project sponsored by the Space and Geophysics Laboratory (SGL), part of the Applied Research diff --git a/swig/sphinx/conf.py b/swig/sphinx/conf.py index 813aef380..ebb46137b 100755 --- a/swig/sphinx/conf.py +++ b/swig/sphinx/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = '3.0' +version = '3.1' # The full version, including alpha/beta/rc tags. -release = '3.0.0' +release = '3.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.