Skip to content

Commit

Permalink
Release 2.5.0 (#659)
Browse files Browse the repository at this point in the history
* Add Python 3.7 to nix environement for releasing

* Re-work how the dist environment is configured

* Use 127.x.x.x instead of localhost

* Version 2.5.0

* RELEASE_NOTES doesn't exist anymore
  • Loading branch information
Jason Mobarak authored Mar 1, 2019
1 parent a92167c commit 7e9a6d3
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 14 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Change Log

## [2.5.0](https://github.com/swift-nav/libsbp/tree/v2.5.0)

[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.4.10...v2.5.0)

**Merged pull requests:**

- Python 3 support
- added virtualenv instructions for the python bindings for libsbp [\#654](https://github.com/swift-nav/libsbp/pull/654)
- Updated CMake files [\#652](https://github.com/swift-nav/libsbp/pull/652)
- Use twine/nix to push to PyPI, auto-mangle IS\_RELEASED \[ESD-1038\] [\#651](https://github.com/swift-nav/libsbp/pull/651)

## [v2.4.10](https://github.com/swift-nav/libsbp/tree/v2.4.10) (2019-02-14)
[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.4.9...v2.4.10)

Expand Down Expand Up @@ -1409,4 +1420,4 @@



\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
4 changes: 2 additions & 2 deletions HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ Ubuntu 16.04.

- Others: should be automatically extracted from git tag

2. Add to RELEASE_NOTES.md and update the CHANGELOG details with `make
release`. Submit a pull request and get it merged. This requires
2. Update the CHANGELOG details with `make release`. Submit a pull request and
get it merged. This requires
[github-changelog-generator](https://github.com/skywinder/github-changelog-generator),
and a `CHANGELOG_GITHUB_TOKEN` in your `PATH` if you don't already have
them.
Expand Down
4 changes: 2 additions & 2 deletions c/include/libsbp/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
/** Protocol major version. */
#define SBP_MAJOR_VERSION 2
/** Protocol minor version. */
#define SBP_MINOR_VERSION 4
#define SBP_MINOR_VERSION 5
/** Protocol patch version. */
#define SBP_PATCH_VERSION 10
#define SBP_PATCH_VERSION 0

/** \} */

Expand Down
18 changes: 14 additions & 4 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@ stdenv.mkDerivation rec {
buildInputs = [
libiconv
zlib
clang_5
clang_6
check
gradle
zlib.dev
ghc
cabal-install
python27Full
python27Packages.virtualenv
python27Packages.setuptools
python27Packages.wheel
python27Packages.twine
python27Packages.virtualenv
python27Packages.pip
python37Full
python37Packages.setuptools
python27Packages.virtualenv
python37Packages.pip
nodejs
coreutils
bash
Expand All @@ -28,5 +31,12 @@ stdenv.mkDerivation rec {
];
shellHook = ''
[[ -z "$SOURCE_DATE_EPOCH" ]] || unset SOURCE_DATE_EPOCH
rm -rf .dist.py2
rm -rf .dist.py3
virtualenv .dist.py2
virtualenv .dist.py3 --python=`which python3`
.dist.py2/bin/pip install --ignore-installed twine wheel virtualenv
.dist.py3/bin/pip install --ignore-installed twine wheel virtualenv
source .dist.py3/bin/activate
'';
}
Binary file modified docs/sbp.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion haskell/sbp.cabal.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: sbp
version: 2.4.10
version: 2.5.0
synopsis: SwiftNav's SBP Library
homepage: https://github.com/swift-nav/libsbp
license: LGPL-3
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sbp",
"version": "2.4.10",
"version": "2.5.0",
"description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
"files": [
"javascript/*",
Expand Down
2 changes: 1 addition & 1 deletion python/sbp/RELEASE-VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.10
2.5.0
2 changes: 1 addition & 1 deletion python/tests/sbp/client/test_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class MockServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
pass

def tcp_server(handler):
server = MockServer(("localhost", 0), handler)
server = MockServer(("127.0.0.1", 0), handler)
ip, port = server.server_address
server_thread = threading.Thread(target=server.serve_forever)
server_thread.daemon = True
Expand Down

0 comments on commit 7e9a6d3

Please sign in to comment.