FIX Flask dependency in CI

telefonicaid · Oct 17, 2023 · 5de3e46 · 5de3e46
1 parent de8d7ab
commit 5de3e46
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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