Merge branch 'main' into dwd-mqtt

Daveiano · Feb 24, 2024 · f227076 · f227076
2 parents a9f3184 + 9a51409
commit f227076
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.10-buster
 LABEL org.opencontainers.image.authors="David Baetge <[email protected]>"
 
 ARG WEEWX_VERSION="5.0.2"
-ARG WDC_VERSION="v3.5.0-beta1"
+ARG WDC_VERSION="v3.5.0"
 ARG WEEWX_UID=2749
 ENV WEEWX_HOME="/home/weewx-data"
 

diff --git a/readme.md b/readme.md
@@ -17,7 +17,7 @@ WeeWX is installed via the [`pip` installation method](https://www.weewx.com/doc
 * Build `docker build . -t "weewx"`
   * Default build args:
     * **ARG** WEEWX_VERSION="5.0.2"
-    * **ARG** WDC_VERSION="v3.5.0-alpha2"
+    * **ARG** WDC_VERSION="v3.5.0"
 * Run `docker run -d --restart unless-stopped -p 9877:9877 --name weewx weewx`
 * Step into with `docker exec -it weewx /bin/bash`
 

diff --git a/src/install-input.txt b/src/install-input.txt
diff --git a/src/skin.conf b/src/skin.conf
@@ -1,6 +1,6 @@
 # configuration file for the weewx-wdc skin
 SKIN_NAME = Weather Data Center
-SKIN_VERSION = 3.5.0-beta1
+SKIN_VERSION = 3.5.0
 
 # For instructions, see https://github.com/Daveiano/weewx-wdc/wiki/Custom-data-bindings
 [ObservationBindings]
@@ -800,7 +800,7 @@ SKIN_VERSION = 3.5.0-beta1
             [[[[observations]]]]
                 [[[[[temp_min_max_avg]]]]]
                 [[[[[tempdew]]]]]
-                [[[[[vegetation]]]]]
+                #[[[[[vegetation]]]]]
                 [[[[[outHumidity]]]]]
                 [[[[[barometer]]]]]
                 [[[[[windchill_heatindex]]]]]
@@ -833,7 +833,7 @@ SKIN_VERSION = 3.5.0-beta1
             [[[[observations]]]]
                 [[[[[temp_min_max_avg]]]]]
                 [[[[[tempdew]]]]]
-                [[[[[vegetation]]]]]
+                #[[[[[vegetation]]]]]
                 [[[[[outHumidity]]]]]
                 [[[[[barometer]]]]]
                 [[[[[windchill_heatindex]]]]]
@@ -863,7 +863,7 @@ SKIN_VERSION = 3.5.0-beta1
             [[[[observations]]]]
                 [[[[[temp_min_max_avg]]]]]
                 [[[[[tempdew]]]]]
-                [[[[[vegetation]]]]]
+                #[[[[[vegetation]]]]]
                 [[[[[outHumidity]]]]]
                 [[[[[barometer]]]]]
                 [[[[[windchill_heatindex]]]]]