From 5de3e4655ae51728eb2e5823d85a1d99ffa5049b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Tue, 17 Oct 2023 09:51:34 +0200 Subject: [PATCH] FIX Flask dependency in CI --- ci/deb/build-dep.sh | 1 + doc/manuals.jp/admin/build_source.md | 2 +- doc/manuals/admin/build_source.md | 2 +- doc/manuals/user/walkthrough_apiv2.md | 4 ++-- test/functionalTest/README.jp.md | 2 ++ test/functionalTest/README.md | 3 ++- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ci/deb/build-dep.sh b/ci/deb/build-dep.sh index 5ee98b8e5e..6b7f76fac4 100755 --- a/ci/deb/build-dep.sh +++ b/ci/deb/build-dep.sh @@ -64,6 +64,7 @@ echo "INSTALL: python special dependencies" \ && python3 -m venv /opt/ft_env \ && . /opt/ft_env/bin/activate \ && pip install Flask==2.0.2 \ +&& pip install Werkzeug==2.0.2 \ && pip install paho-mqtt==1.6.1 \ && pip install amqtt==0.11.0b1 \ && deactivate diff --git a/doc/manuals.jp/admin/build_source.md b/doc/manuals.jp/admin/build_source.md index ee4a300150..8b6936c127 100644 --- a/doc/manuals.jp/admin/build_source.md +++ b/doc/manuals.jp/admin/build_source.md @@ -132,7 +132,7 @@ aarch64 アーキテクチャの場合、apt-get を使用して libxslt をイ . scripts/testEnv.sh python3 -m venv /opt/ft_env # or 'virtualenv /opt/ft_env --python=/usr/bin/python3' in some systems . /opt/ft_env/bin/activate - pip install Flask==2.0.2 paho-mqtt==1.6.1 amqtt==0.11.0b1 + pip install Flask==2.0.2 Werkzeug==2.0.2 paho-mqtt==1.6.1 amqtt==0.11.0b1 * この環境でテスト・ハーネスを実行してください (時間がかかりますので、気をつけてください) diff --git a/doc/manuals/admin/build_source.md b/doc/manuals/admin/build_source.md index 38bbca42cc..d839243cb8 100644 --- a/doc/manuals/admin/build_source.md +++ b/doc/manuals/admin/build_source.md @@ -131,7 +131,7 @@ In the case of the aarch64 architecture, install libxslt using apt-get, and run . scripts/testEnv.sh python3 -m venv /opt/ft_env # or 'virtualenv /opt/ft_env --python=/usr/bin/python3' in some systems . /opt/ft_env/bin/activate - pip install Flask==2.0.2 paho-mqtt==1.6.1 amqtt==0.11.0b1 + pip install Flask==2.0.2 Werkzeug==2.0.2 paho-mqtt==1.6.1 amqtt==0.11.0b1 * Run test harness in this environment (it takes some time, please be patient). diff --git a/doc/manuals/user/walkthrough_apiv2.md b/doc/manuals/user/walkthrough_apiv2.md index 65b4baf8cd..9ffbf6407a 100644 --- a/doc/manuals/user/walkthrough_apiv2.md +++ b/doc/manuals/user/walkthrough_apiv2.md @@ -123,8 +123,8 @@ command: # ./accumulator-server.py --port 1028 --url /accumulate --host ::1 --pretty-print -v ``` -Note this script requires Flask version 2.0.2 and paho-mqtt version 1.6.1, which can be installed using -`pip install Flask==2.0.2` and `pip install paho-mqtt==1.6.1`. In addition, it is recommended to use +Note this script requires Flask version 2.0.2 (along with Werkzeug 2.0.2) and paho-mqtt version 1.6.1, which can be installed using +`pip install Flask==2.0.2 Werkzeug==2.0.2` and `pip install paho-mqtt==1.6.1` respectively. In addition, it is recommended to use Python 3.10.x In case of conflict with your base operating system Python installation, we recommend to use [virtualenv](https://virtualenv.pypa.io/en/latest/). More information about installing the accumulator (including an alternative based in docker) can be checked diff --git a/test/functionalTest/README.jp.md b/test/functionalTest/README.jp.md index b744839cea..6d039e8d71 100644 --- a/test/functionalTest/README.jp.md +++ b/test/functionalTest/README.jp.md @@ -27,6 +27,7 @@ virtualenv --python=/usr/bin/python3 /path/to/ft_env ``` pip install Flask==2.0.2 +pip install Werkzeug==2.0.2 pip install paho-mqtt==1.6.1 pip install amqtt==0.11.0b1 # Not actually an accumulator-server.py dependency, but needed by some tests ``` @@ -55,6 +56,7 @@ RUN apt-get update -y RUN apt-get install -y python3 RUN apt-get install -y python3-pip RUN pip install Flask==2.0.2 +RUN pip install Werkzeug==2.0.2 RUN pip install paho-mqtt==1.6.1 COPY . /app WORKDIR /app diff --git a/test/functionalTest/README.md b/test/functionalTest/README.md index 541e1f02bc..8fbe8e57d8 100644 --- a/test/functionalTest/README.md +++ b/test/functionalTest/README.md @@ -25,6 +25,7 @@ Next install accumulator-server.py depencencies: ``` pip install Flask==2.0.2 +pip install Werkzeug==2.0.2 pip install paho-mqtt==1.6.1 pip install amqtt==0.11.0b1 # Not actually an accumulator-server.py dependency, but needed by some tests ``` @@ -57,7 +58,7 @@ RUN python3 -m venv /venv ENV PATH="/venv/bin:$PATH" # Install required packages within the virtual environment -RUN pip install Flask==2.0.2 paho-mqtt==1.6.1 +RUN pip install Flask==2.0.2 Werkzeug==2.0.2 paho-mqtt==1.6.1 COPY . /app WORKDIR /app