Skip to content

Commit

Permalink
Update weewx version to 5.1.0 and adjust DWD installation script (pin…
Browse files Browse the repository at this point in the history
…ned to old version to allow tests to pass). Added six to pip install. GH--283
  • Loading branch information
Daveiano committed Nov 4, 2024
1 parent 8006446 commit a937273
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/test_install_report/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM python:3.10-buster

LABEL org.opencontainers.image.authors="David Baetge <[email protected]>"

ARG WEEWX_VERSION="5.0.2"
ARG WEEWX_VERSION="5.1.0"
ARG WEEWX_UID=2749
ENV WEEWX_HOME="/home/weewx-data"
RUN current_date=$(date +%Y-%m-%d\ %H:%M:%S)
Expand Down Expand Up @@ -66,7 +66,7 @@ WORKDIR ${WEEWX_HOME}
RUN python3 -m venv ${WEEWX_HOME}/weewx-venv &&\
# shellcheck source=/dev/null
. ${WEEWX_HOME}/weewx-venv/bin/activate &&\
python3 -m pip install --no-cache-dir weewx==${WEEWX_VERSION}
python3 -m pip install --no-cache-dir weewx==${WEEWX_VERSION} six

RUN . ${WEEWX_HOME}/weewx-venv/bin/activate &&\
weectl station create "${WEEWX_HOME}" --no-prompt \
Expand Down
4 changes: 2 additions & 2 deletions test/test_install_report/src/start-dwd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ sed -i '/A SQLite database is simply a single file/a \[\[dwd_sqlite\]\]\n
cat /tmp/dwd-extensions.py >> "${WEEWX_HOME}"/bin/user/extensions.py

# weewx-DWD installieren.
cd /tmp && wget -nv -O "weewx-dwd.zip" "https://github.com/roe-dl/weewx-DWD/archive/refs/heads/master.zip"
cd /tmp && wget -nv -O "weewx-dwd.zip" "https://github.com/roe-dl/weewx-DWD/archive/f9400d8edd5689a28d4f45ef0017f355905dd4e7.zip"
unzip /tmp/weewx-dwd.zip -d /tmp/weewx-dwd/
cp -R /tmp/weewx-dwd/weewx-DWD-master/usr/ /
cp -R /tmp/weewx-dwd/weewx-DWD-f9400d8edd5689a28d4f45ef0017f355905dd4e7/usr/ /
sed -i -z -e "s|PTH=\"/etc/weewx/skins/Belchertown/dwd\"|PTH=\"/home/weewx-data/skins/weewx-wdc/dwd\"|g" /usr/local/bin/wget-dwd
sed -i -z -e "s|config = configobj.ConfigObj(\"/etc/weewx/weewx.conf\")|config = configobj.ConfigObj(\"/home/weewx-data/weewx.conf\")|g" /usr/local/bin/dwd-warnings
mkdir "${WEEWX_HOME}/skins/weewx-wdc/dwd"
Expand Down

0 comments on commit a937273

Please sign in to comment.