Version 2.6.1 (#696)

* Logic error in INSTALL_REQUIRES for LIBSBP_BUILD_ANY If LIBSBP_BUILD_ANY is enabled, then INSTALL_REQUIRES should contain SETUP_REQUIRES (which includes numba/llvmlite) otherwise it should not since the point of the 2.6.0 changes was to remove these deps. * Version bumps * Remove circular dep * Changelog updates * doc updates
swift-nav · Jun 6, 2019 · 5fb0831 · 5fb0831
1 parent cfd15ac
commit 5fb0831
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## [2.6.1](https://github.com/swift-nav/libsbp/tree/v2.6.1)
+
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.6.0...v2.6.1)
+
+**Merged pull requests:**
+
+- Add QZSS eph [\#695](https://github.com/swift-nav/libsbp/pull/695)
+- Import standard cmake modules, standardise dependency resolution \[ESD-1246\] \[ESD-1247\] [\#692](https://github.com/swift-nav/libsbp/pull/692)
+
+
 ## [2.6.0](https://github.com/swift-nav/libsbp/tree/v2.6.0)
 
 [Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.5.5...v2.6.0)

diff --git a/Makefile b/Makefile
@@ -95,7 +95,7 @@ verify-prereq-java: verify-prereq-generator
 
 verify-prereq-haskell: verify-prereq-generator
 
-verify-prereq-protobuf: verify-prereq-protobuf
+verify-prereq-protobuf: verify-prereq-generator
 
 verify-prereq-docs: verify-prereq-generator
 	@command -v pdflatex  1>/dev/null 2>/dev/null || { echo >&2 -e "I require \`pdflatex\` but it's not installed. Aborting.\n\nHave you installed pdflatex? See the generator readme (Installing instructions) at \`generator/README.md\` for setup instructions.\n"; exit 1; }

diff --git a/c/include/libsbp/version.h b/c/include/libsbp/version.h
@@ -25,7 +25,7 @@
 /** Protocol minor version. */
 #define SBP_MINOR_VERSION 6
 /** Protocol patch version. */
-#define SBP_PATCH_VERSION 0
+#define SBP_PATCH_VERSION 1
 
 /** \} */
 

diff --git a/docs/sbp.pdf b/docs/sbp.pdf
diff --git a/haskell/sbp.cabal b/haskell/sbp.cabal
@@ -1,5 +1,5 @@
 name:                  sbp
-version:               2.6.0
+version:               2.6.1
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sbp",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
   "files": [
     "javascript/*",

diff --git a/python/sbp/RELEASE-VERSION b/python/sbp/RELEASE-VERSION
@@ -1 +1 @@
-2.6.0
+2.6.1
diff --git a/python/setup.py b/python/setup.py
@@ -177,10 +177,11 @@ def write_version_py(filename=VERSION_PY_PATH):
     print("Building/installing libsbp version {} (read version: {})".format(sbp_version, VERSION))
 
     ext_modules = None
-    if not os.environ.get('LIBSBP_BUILD_ANY', None):
+    if os.environ.get('LIBSBP_BUILD_ANY', None):
+        INSTALL_REQUIRES.extend(SETUP_REQUIRES)
+    else:
         from sbp.jit.parse import cc
         ext_modules = [cc.distutils_extension()]
-        INSTALL_REQUIRES.extend(SETUP_REQUIRES)
 
     setup(name='sbp',
           version=sbp_version,