Merge pull request #480 from openxc/next

Merge next into master for 8.2.1 release
openxc · Aug 12, 2021 · 4c3d416 · 4c3d416
2 parents 7510a54 + 917fa01
commit 4c3d416
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd
@@ -1,4 +1,7 @@
 # OpenXC Vehicle Interface Firmware Changelog
+## v8.2.1
+* Fix: Bootstrap fix
+
 ## v8.2.0
 * Removed: Removed messagepack format support
 * Feature: get_vin command added and is accessible from openxc-control python and from Android and iOS clients

diff --git a/README.rst b/README.rst
@@ -4,7 +4,7 @@ OpenXC Vehicle Interface Firmware
 
 .. image:: /docs/_static/logo.png
 
-:Version: 8.2.0
+:Version: 8.2.1
 :Web: http://openxcplatform.com
 :Documentation: http://vi-firmware.openxcplatform.com
 :Source: http://github.com/openxc/vi-firmware

diff --git a/docs/conf.py b/docs/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '8.2.0'
+version = '8.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '8.2.0'
+release = '8.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -4,7 +4,7 @@ OpenXC Vehicle Interface Firmware
 
 .. image:: /_static/logo.png
 
-:Version: 8.2.0
+:Version: 8.2.1
 :Web: http://openxcplatform.com
 :Documentation: http://vi-firmware.openxcplatform.com
 :Source: http://github.com/openxc/vi-firmware

diff --git a/script/bootstrap/common.sh b/script/bootstrap/common.sh
@@ -234,6 +234,7 @@ pre-configured Vagrant environment. See the docs for more information."
     if ! command -v pip3 >/dev/null 2>&1; then
         _install python3-pip
         $SUDO_CMD ln -s /usr/bin/pip3 /usr/bin/pip
+	$SUDO_CMD pip install --upgrade pip
     fi
 
     PIP_SUDO_CMD=

diff --git a/src/config.cpp b/src/config.cpp
@@ -118,7 +118,7 @@ openxc::telitHE910::TelitDevice telitDevice = {
 openxc::config::Configuration* openxc::config::getConfiguration() {
     static openxc::config::Configuration CONFIG = {
         messageSetIndex: 0,
-        version: "8.2.0",
+        version: "8.2.1",
         dummyVin: "Failed to get VIN temporary VIN is :00000000123456789",
         platform: PLATFORM,
         environmentMode: ENVIRONMENT_MODE,