diff --git a/library/CHANGELOG.txt b/library/CHANGELOG.txt index 0bf69b4..b9496a2 100644 --- a/library/CHANGELOG.txt +++ b/library/CHANGELOG.txt @@ -1,9 +1,7 @@ 1.0.3 ----- -* Merged fixes from Bosch BME680_driver version 3.5.3 -* Replaced division with logical shift in compensation equations -* Fixed bug in temperature compensation of pressure +* Merged temperature compensation fix from Bosch's BME680_driver 3.5.3 1.0.2 ----- diff --git a/library/bme680/__init__.py b/library/bme680/__init__.py index c51d9dd..1e5bfcb 100644 --- a/library/bme680/__init__.py +++ b/library/bme680/__init__.py @@ -2,7 +2,7 @@ from .constants import * import math import time -__version__ = '1.0.2' +__version__ = '1.0.3' class BME680(BME680Data): """BOSCH BME680 diff --git a/library/setup.py b/library/setup.py index 2761a9d..911b539 100755 --- a/library/setup.py +++ b/library/setup.py @@ -39,7 +39,7 @@ classifiers = ['Development Status :: 5 - Production/Stable', setup( name = 'bme680', - version = '1.0.2', + version = '1.0.3', author = 'Philip Howard', author_email = 'phil@pimoroni.com', description = """Python library for driving the Pimoroni BME680 Breakout""", diff --git a/packaging/CHANGELOG b/packaging/CHANGELOG index 3c42607..c3f5684 100644 --- a/packaging/CHANGELOG +++ b/packaging/CHANGELOG @@ -1,3 +1,9 @@ +bme680 (1.0.3) stable; urgency=low + + * Merged temperature compensation fix from Bosch's BME680_driver 3.5.3 + + -- Phil Howard Wed, 22 Nov 2017 00:00:00 +0000 + bme680 (1.0.2) stable; urgency=low * Fixed set_gas_heater_temperature to avoid i2c TypeError diff --git a/packaging/bme680_1.0.2_armhf.raspberrypi.upload b/packaging/bme680_1.0.2_armhf.raspberrypi.upload new file mode 100644 index 0000000..c90ca84 --- /dev/null +++ b/packaging/bme680_1.0.2_armhf.raspberrypi.upload @@ -0,0 +1,5 @@ +Successfully uploaded bme680_1.0.2.dsc to build-master.raspberrypi.org for raspberrypi. +Successfully uploaded bme680_1.0.2.tar.xz to build-master.raspberrypi.org for raspberrypi. +Successfully uploaded python-bme680_1.0.2_all.deb to build-master.raspberrypi.org for raspberrypi. +Successfully uploaded python3-bme680_1.0.2_all.deb to build-master.raspberrypi.org for raspberrypi. +Successfully uploaded bme680_1.0.2_armhf.changes to build-master.raspberrypi.org for raspberrypi. diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 3c42607..c3f5684 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +bme680 (1.0.3) stable; urgency=low + + * Merged temperature compensation fix from Bosch's BME680_driver 3.5.3 + + -- Phil Howard Wed, 22 Nov 2017 00:00:00 +0000 + bme680 (1.0.2) stable; urgency=low * Fixed set_gas_heater_temperature to avoid i2c TypeError diff --git a/packaging/makelog.sh b/packaging/makelog.sh index 1055987..15d660e 100755 --- a/packaging/makelog.sh +++ b/packaging/makelog.sh @@ -39,9 +39,10 @@ inform "seeded debian changelog" # generate pypi changelog -sed -e "/--/d" -e "s/ \*/\*/" \ - -e "s/.*\([0-9].[0-9].[0-9]\).*/\1/" \ - -e '/[0-9].[0-9].[0-9]/ a\ +sed -e "/--/d" \ + -e "s/ \*/\*/" \ + -e "s/.*(\([0-9].[0-9].[0-9]\)).*/\1/" \ + -e '/^[0-9].[0-9].[0-9]$/ a\ -----' $mainlog | cat -s > $pypilog version=$(head -n 1 $pypilog) diff --git a/packaging/test.txt b/packaging/test.txt new file mode 100644 index 0000000..e69de29 diff --git a/packaging/testlog.sh b/packaging/testlog.sh new file mode 100755 index 0000000..691b69f --- /dev/null +++ b/packaging/testlog.sh @@ -0,0 +1,8 @@ +#!/bin/bash + + +sed -e "/--/d" \ + -e "s/ \*/\*/" \ + -e "s/.*(\([0-9].[0-9].[0-9]\)).*/\1/" \ + -e '/^[0-9].[0-9].[0-9]$/ a\ +-----' CHANGELOG