diff --git a/bin/user/bloomsky.py b/bin/user/bloomsky.py index 02212dc..d967039 100644 --- a/bin/user/bloomsky.py +++ b/bin/user/bloomsky.py @@ -18,10 +18,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. -Version: 2.0.0b1 Date: 27 July 2020 +Version: 2.0.0 Date: 3 August 2020 Revision History - 27 July 2020 v2.0.0 + 3 August 2020 v2.0.0 - WeeWX v4 python2/3 compatible - restructured main() - restructured options menu when running directly @@ -232,7 +232,7 @@ def log_traceback_info(prefix=''): DRIVER_NAME = 'Bloomsky' -DRIVER_VERSION = "2.0.0b1" +DRIVER_VERSION = "2.0.0" def loader(config_dict, engine): diff --git a/changelog b/changelog index 9d76743..248dd8b 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +v2.0.0 +* WeeWX 3.7+/4.x python2/3 compatible +* restructured main() +* restructured options menu when driver is run directly +* accumulator 'noop' adder now added for field 'raining' on install v1.0.0 * now works under python 2.6+ or python 3.5+ (python 2.5 no longer supported - use v0.1.1) diff --git a/install.py b/install.py index e3bb25e..5edf43d 100644 --- a/install.py +++ b/install.py @@ -10,11 +10,11 @@ Installer for Bloomsky Driver -Version: 2.0.0b1 Date: 27 July 2020 +Version: 2.0.0 Date: 3 August 2020 Revision History - 27 July 2020 v2.0.0 - - now WeeWX v4.0 python2/3 compatible + 27 August 2020 v2.0.0 + - now WeeWX 3.7+/4.x python2/3 compatible - added accumulator noop adder for field raining 31 May 2019 v1.0.0 - bump version number only @@ -34,7 +34,7 @@ from setup import ExtensionInstaller REQUIRED_VERSION = "3.7.0" -BLOOMSKY_VERSION = "2.0.0b1" +BLOOMSKY_VERSION = "2.0.0" def loader(): diff --git a/readme.md b/readme.md index 1df98e5..081e4d5 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ The BloomSky driver is a WeeWX driver that supports the BloomSky Sky1, Sky2 and ## Pre-Requisites ## -The BloomSky driver requires WeeWX v3.7.0 or greater. A BloomSky API key is also required and can be obtained from [dashboard.bloomsky.com](dashboard.bloomsky.com). +The BloomSky driver requires WeeWX v3.7.0 or greater. Both Python 2 and Python 3 are supported when using WeeWX v4.0.0 or later. A BloomSky API key is also required and can be obtained from [dashboard.bloomsky.com](dashboard.bloomsky.com). ## Installation Instructions ## @@ -20,7 +20,7 @@ The BloomSky driver requires WeeWX v3.7.0 or greater. A BloomSky API key is also 1. Download the latest BloomSky driver extension from the [Bloomsky driver releases page](https://github.com/gjr80/weewx-bloomsky/releases) into a directory accessible from the WeeWX machine. - $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0b1.tar.gz + $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0.tar.gz where *$DOWNLOAD_ROOT* is the path to the directory where the BloomSky driver extension is to be downloaded. @@ -38,15 +38,15 @@ The BloomSky driver requires WeeWX v3.7.0 or greater. A BloomSky API key is also 1. Install the BloomSky driver extension downloaded at step 1 using the *wee_extension* utility: - $ wee_extension --install=$DOWNLOAD_ROOT/bloomsky-2.0.0b1.tar.gz + $ wee_extension --install=$DOWNLOAD_ROOT/bloomsky-2.0.0.tar.gz This will result in output similar to the following: - Request to install '/var/tmp/bloomsky-2.0.0b1.tar.gz' - Extracting from tar archive /var/tmp/bloomsky-2.0.0b1.tar.gz + Request to install '/var/tmp/bloomsky-2.0.0.tar.gz' + Extracting from tar archive /var/tmp/bloomsky-2.0.0.tar.gz Saving installer file to /home/weewx/bin/user/installer/Bloomsky Saved configuration dictionary. Backup copy at /home/weewx/weewx.conf.20200523124410 - Finished installing extension '/var/tmp/bloomsky-2.0.0b1.tar.gz' + Finished installing extension '/var/tmp/bloomsky-2.0.0.tar.gz' 1. Select and configure the driver: @@ -90,13 +90,13 @@ This will result in the driver collecting data from the bloomsky API and emittin 1. Download the latest BloomSky driver extension from the [Bloomsky driver releases page](https://github.com/gjr80/weewx-bloomsky/releases) into a directory accessible from the WeeWX machine. - $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0b1.tar.gz + $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0.tar.gz where *$DOWNLOAD_ROOT* is the path to the directory where the BloomSky driver extension is to be downloaded. 1. Unpack the extension as follows: - $ tar xvfz bloomsky-2.0.0b1.tar.gz + $ tar xvfz bloomsky-2.0.0.tar.gz 1. Copy the *bloomsky.py* file from within the resulting folder as follows: diff --git a/readme.txt b/readme.txt index 30f0ce1..632c6ba 100644 --- a/readme.txt +++ b/readme.txt @@ -4,8 +4,9 @@ observation data from the BloomSky devices. Pre-Requisites -The BloomSky driver requires WeeWX v3.7.0 or greater. A BloomSky API key is -also required and can be obtained from dashboard.bloomsky.com. +The BloomSky driver requires WeeWX v3.7.0 or greater. Both Python 2 and Python 3 +are supported when using WeeWX v4.0.0 or later. A BloomSky API key is also +required and can be obtained from dashboard.bloomsky.com. Installation Instructions @@ -29,7 +30,7 @@ names are used below: releases page (https://github.com/gjr80/weewx-bloomsky/releases) into a directory accessible from the WeeWX machine. - $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0b1.tar.gz + $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0.tar.gz where $DOWNLOAD_ROOT is the path to the directory where the BloomSky driver data extension is to be downloaded. @@ -49,15 +50,15 @@ a directory accessible from the WeeWX machine. 3. Install the BloomSky driver extension downloaded at step 1 using the *wee_extension* utility: - $ wee_extension --install=$DOWNLOAD_ROOT/bloomsky-2.0.0b1.tar.gz + $ wee_extension --install=$DOWNLOAD_ROOT/bloomsky-2.0.0.tar.gz This will result in output similar to the following: - Request to install '/var/tmp/bloomsky-2.0.0b1.tar.gz' - Extracting from tar archive /var/tmp/bloomsky-2.0.0b1.tar.gz + Request to install '/var/tmp/bloomsky-2.0.0.tar.gz' + Extracting from tar archive /var/tmp/bloomsky-2.0.0.tar.gz Saving installer file to /home/weewx/bin/user/installer/Bloomsky Saved configuration dictionary. Backup copy at /home/weewx/weewx.conf.20200523124410 - Finished installing extension '/var/tmp/bloomsky-2.0.0b1.tar.gz' + Finished installing extension '/var/tmp/bloomsky-2.0.0.tar.gz' 4. Select and configure the driver: @@ -106,14 +107,14 @@ Manual installation releases page (https://github.com/gjr80/weewx-bloomsky/releases) into a directory accessible from the WeeWX machine. - $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0b1.tar.gz + $ wget -P $DOWNLOAD_ROOT https://github.com/gjr80/weewx-bloomsky/releases/download/v2.0.0/bloomsky-2.0.0.tar.gz where $DOWNLOAD_ROOT is the path to the directory where the BloomSky driver data extension is to be downloaded. 2. Unpack the extension as follows: - $ tar xvfz bloomsky-2.0.0b1.tar.gz + $ tar xvfz bloomsky-2.0.0.tar.gz 3. Copy the bloomsky.py file from within the resulting folder as follows: