Merge branch 'develop' into release

bin/user/weatherlink_live/static/version.py

@@ -20,4 +20,4 @@
 
 
 DRIVER_NAME = "WeatherLinkLive"
-DRIVER_VERSION = "1.1.1"
+DRIVER_VERSION = "1.1.2"

changes.md

@@ -178,3 +178,7 @@ Documentation was expanded and split into multiple separate documents.
 Driver is now compatible with **Python 3.7 or later**.
 
 - **State required Python version in documentation**
+
+## Version 1.1.2
+
+- **Fix installation issue** on WeeWX 5 beta

install.py

@@ -33,7 +33,7 @@ class WeatherLinkLiveInstaller(ExtensionInstaller):
     def __init__(self):
         super(WeatherLinkLiveInstaller, self).__init__(
             name='weatherlink-live',
-            version="1.1.1",
+            version="1.1.2",
             description='WeeWX driver for Davis WeatherLink Live.',
             author="Michael Schantl",
             author_email="floss@schantl-lx.at",
@@ -66,5 +66,6 @@ def __init__(self):
                     'bin/user/weatherlink_live/static/targets.py',
                     'bin/user/weatherlink_live/static/version.py',
                 ]),
-            ]
+            ],
+            config=dict(),
         )

vm/bin/weewx-5-install.sh

@@ -16,7 +16,11 @@ else
     git pull origin
 fi
 
+python -m venv ./venv
+. ./venv/bin/activate
 pip install poetry mkdocs mkdocs-material pymdown-extensions
-make pypi-packages
+make pypi-package
+deactivate
 
-pip install $SRC_DIR/dist/weewx-5.*.whl
+pipx install $SRC_DIR/dist/weewx-5.*.whl
+pipx inject weewx requests

vm/provision.sh

@@ -5,6 +5,7 @@ set -e
 PACKAGES=(
   "python"
   "python-pip"
+  "python-pipx"
 )
 PATH_ENTRIES=(
   "$HOME/.local/bin"