Skip to content

Commit b4c6d43

Browse files
authored
Upgrade gunicorn to v22 to solve security issue (#258)
1 parent 9f5de41 commit b4c6d43

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

.github/workflows/checks.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ jobs:
1616
- name: Set up Python
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: "3.7"
19+
python-version: "3.10"
20+
- name: Pin pip version
21+
run: python -m pip install --upgrade "pip<24.1"
2022
- name: Install requirements
2123
run: |
2224
pip install .
@@ -35,15 +37,17 @@ jobs:
3537
- name: Check out repository
3638
uses: actions/checkout@v3
3739
- name: Deploy app
38-
run: docker-compose up -d --build
40+
run: docker compose up -d --build
3941
- name: Wait for app startup
4042
shell: bash
41-
run: sleep 20
43+
run: |
44+
sleep 20
45+
docker compose ps
4246
- name: Run integration tests
4347
shell: bash
4448
run: bash tests/integration_tests.sh
4549
- name: Tear down app
46-
run: docker-compose down
50+
run: docker compose down
4751
publish:
4852
name: Build and publish app image
4953
runs-on: ubuntu-latest

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM elixircloud/foca:20221110-py3.7
1+
FROM elixircloud/foca:20240711-py3.12
22

33
LABEL version="2.0"
44
LABEL software="cwl-WES"

cwl_wes/tasks/workflow_run_manager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ def update_run_document( # pylint: disable=too-many-branches
260260
task_logs: Task run logs.
261261
**run_log_params: Run log parameters.
262262
"""
263+
document = None
263264
# TODO: Minimize db ops; try to compile entire object & update once
264265
# Update internal parameters
265266
if internal:

requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
foca~=0.12.0
1+
foca==0.12.1
2+
flask-authz==2.5.0
23
# cwl-tes @ git+https://github.com/ohsu-comp-bio/cwl-tes.git@7b44cb1825a302bb7eccb3f2d91dc233adc0e32f#egg=cwl-tes
34
drs-cli~=0.2.3
4-
gunicorn~=19.9.0
5+
gunicorn~=22.0
56
py-tes~=0.4.2
67
importlib-metadata==4.13.0
78
yq==3.2.3
9+
setuptools<69

requirements_dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
black~=22.12
2-
flake8~=5.0
2+
flake8~=7.0
33
flake8-docstrings~=1.6
44
mypy~=0.991
5-
pylint~=2.15
5+
pylint==3.2.6

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"Intended Audience :: Science/Research",
3636
"Topic :: Scientific/Engineering :: Bio-Informatics",
3737
"Natural Language :: English",
38-
"Programming Language :: Python :: 3.7",
38+
"Programming Language :: Python :: 3.12",
3939
],
4040
install_requires=INSTALL_REQUIRES,
4141
)

0 commit comments

Comments
 (0)