Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX Flask dependency in CI #4437

Merged
merged 1 commit into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/deb/build-dep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/manuals.jp/admin/build_source.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

* この環境でテスト・ハーネスを実行してください (時間がかかりますので、気をつけてください)

Expand Down
2 changes: 1 addition & 1 deletion doc/manuals/admin/build_source.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
4 changes: 2 additions & 2 deletions doc/manuals/user/walkthrough_apiv2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/functionalTest/README.jp.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/functionalTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down Expand Up @@ -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
Expand Down
Loading