Skip to content
This repository has been archived by the owner on May 29, 2022. It is now read-only.

Commit

Permalink
GPSTk v3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Kuck committed Mar 3, 2020
1 parent e838ce9 commit f6fa2c9
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ package_redhat_py36:
refs:
- master
- /^ci_.*$/
- /^version_.*_prep$/
script:
- mkdir build
- pushd build
Expand Down Expand Up @@ -401,6 +402,7 @@ deploy_debian:
refs:
- master
- /^ci_.*$/
- /^version_.*_prep$/
script:
- cd debs
- sudo apt-get -y install ./*.deb
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}" )

Expand Down
49 changes: 49 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
gpstk (3.1.0-1) stable; urgency=low

* Updated to version 3.1.0

-- Andrew Kuck <[email protected]> Tue, 03 Mar 2020 13:34:46 -0600

gpstk (3.0.0-1) stable; urgency=medium

* Build for stretch
Expand Down
10 changes: 5 additions & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions swig/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f6fa2c9

Please sign in to comment.