Skip to content

Commit 9a943cd

Browse files
committed
setup: upgrade to Flask v2
- Remove `Flask`/`Werkzeug` version upper limit - Increase `Flask`/`Werkzeug` version lower limit - Fix usages of `flask.Request.json`, which now throws an exception instead of returning `None` Closes reanahub#441
1 parent d278ea8 commit 9a943cd

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

reana_workflow_controller/rest/workflows_session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def open_interactive_session(workflow_id_or_name, interactive_session_type): #
121121
),
122122
404,
123123
)
124-
interactive_session_configuration = request.json or {}
124+
interactive_session_configuration = request.json if request.is_json else {}
125125
user_uuid = request.args["user"]
126126
workflow = None
127127
workflow = _get_workflow_with_uuid_or_name(workflow_id_or_name, user_uuid)

reana_workflow_controller/rest/workflows_status.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def get_workflow_logs(workflow_id_or_name, paginate=None, **kwargs): # noqa
151151
403,
152152
)
153153
steps = None
154-
if request.json:
154+
if request.is_json:
155155
steps = request.json
156156
if steps:
157157
workflow_logs = {
@@ -503,7 +503,7 @@ def set_workflow_status(workflow_id_or_name): # noqa
503503
403,
504504
)
505505
parameters = {}
506-
if request.json:
506+
if request.is_json:
507507
parameters = request.json
508508
if status == START:
509509
start_workflow(workflow, parameters)

requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ certifi==2021.10.8 # via kubernetes, requests
1515
cffi==1.15.0 # via cryptography
1616
chardet==3.0.4 # via requests
1717
checksumdir==1.1.9 # via reana-commons
18-
click==7.1.2 # via flask, reana-commons
18+
click==8.1.2 # via flask, reana-commons
1919
cryptography==36.0.2 # via reana-db
20-
flask==1.1.4 # via reana-workflow-controller (setup.py)
20+
flask==2.1.1 # via reana-workflow-controller (setup.py)
2121
fs==2.4.15 # via reana-commons
2222
gitdb==4.0.9 # via gitpython
2323
gitpython==3.1.27 # via reana-workflow-controller (setup.py)
2424
google-auth==2.6.2 # via kubernetes
2525
idna==2.10 # via jsonschema, requests
26-
importlib-metadata==4.11.3 # via alembic
26+
importlib-metadata==4.11.3 # via alembic, flask
2727
importlib-resources==5.6.0 # via alembic
28-
itsdangerous==1.1.0 # via flask
29-
jinja2==2.11.3 # via flask
28+
itsdangerous==2.1.2 # via flask
29+
jinja2==3.1.1 # via flask
3030
jsonpickle==2.1.0 # via reana-workflow-controller (setup.py)
3131
jsonpointer==2.2 # via jsonschema
3232
jsonref==0.2 # via bravado-core
@@ -51,8 +51,8 @@ pyrsistent==0.18.1 # via jsonschema
5151
python-dateutil==2.8.2 # via bravado, bravado-core, kubernetes
5252
pytz==2022.1 # via bravado-core, fs
5353
pyyaml==5.4.1 # via bravado, bravado-core, kubernetes, reana-commons, swagger-spec-validator
54-
reana-commons[kubernetes]==0.9.0a6 # via reana-db, reana-workflow-controller (setup.py)
55-
reana-db==0.9.0a5 # via reana-workflow-controller (setup.py)
54+
reana-commons[kubernetes]==0.9.0a6 # via reana-db, reana-workflow-controller (setup.py)
55+
reana-db==0.9.0a5 # via reana-workflow-controller (setup.py)
5656
requests-oauthlib==1.3.1 # via kubernetes
5757
requests==2.25.0 # via bravado, kubernetes, reana-workflow-controller (setup.py), requests-oauthlib
5858
rfc3987==1.3.8 # via jsonschema
@@ -73,7 +73,7 @@ vine==5.0.0 # via amqp, kombu
7373
webargs==6.1.1 # via reana-workflow-controller (setup.py)
7474
webcolors==1.11.1 # via jsonschema
7575
websocket-client==1.3.2 # via kubernetes
76-
werkzeug==1.0.1 # via flask, reana-commons, reana-workflow-controller (setup.py)
76+
werkzeug==2.1.0 # via flask, reana-commons, reana-workflow-controller (setup.py)
7777
zipp==3.7.0 # via importlib-metadata, importlib-resources
7878

7979
# The following packages are considered to be unsafe in a requirements file:

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
]
5151

5252
install_requires = [
53-
"Flask>=1.0.4,<2.0",
53+
"Flask>=2.1.1",
5454
"MarkupSafe>=2.0.0,<2.1.0",
55-
"Werkzeug>=1.0.1,<2.0",
55+
"Werkzeug>=2.1.0",
5656
"gitpython>=2.1",
5757
"jsonpickle>=0.9.6",
5858
"marshmallow>2.13.0,<=2.20.1",

0 commit comments

Comments
 (0)