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
VMois · Apr 1, 2022 · 9a943cd · 9a943cd
1 parent d278ea8
commit 9a943cd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/reana_workflow_controller/rest/workflows_session.py b/reana_workflow_controller/rest/workflows_session.py
@@ -121,7 +121,7 @@ def open_interactive_session(workflow_id_or_name, interactive_session_type):  #
                 ),
                 404,
             )
-        interactive_session_configuration = request.json or {}
+        interactive_session_configuration = request.json if request.is_json else {}
         user_uuid = request.args["user"]
         workflow = None
         workflow = _get_workflow_with_uuid_or_name(workflow_id_or_name, user_uuid)

diff --git a/reana_workflow_controller/rest/workflows_status.py b/reana_workflow_controller/rest/workflows_status.py
@@ -151,7 +151,7 @@ def get_workflow_logs(workflow_id_or_name, paginate=None, **kwargs):  # noqa
                 403,
             )
         steps = None
-        if request.json:
+        if request.is_json:
             steps = request.json
         if steps:
             workflow_logs = {
@@ -503,7 +503,7 @@ def set_workflow_status(workflow_id_or_name):  # noqa
                 403,
             )
         parameters = {}
-        if request.json:
+        if request.is_json:
             parameters = request.json
         if status == START:
             start_workflow(workflow, parameters)

diff --git a/requirements.txt b/requirements.txt
@@ -15,18 +15,18 @@ certifi==2021.10.8        # via kubernetes, requests
 cffi==1.15.0              # via cryptography
 chardet==3.0.4            # via requests
 checksumdir==1.1.9        # via reana-commons
-click==7.1.2              # via flask, reana-commons
+click==8.1.2              # via flask, reana-commons
 cryptography==36.0.2      # via reana-db
-flask==1.1.4              # via reana-workflow-controller (setup.py)
+flask==2.1.1              # via reana-workflow-controller (setup.py)
 fs==2.4.15                # via reana-commons
 gitdb==4.0.9              # via gitpython
 gitpython==3.1.27         # via reana-workflow-controller (setup.py)
 google-auth==2.6.2        # via kubernetes
 idna==2.10                # via jsonschema, requests
-importlib-metadata==4.11.3  # via alembic
+importlib-metadata==4.11.3  # via alembic, flask
 importlib-resources==5.6.0  # via alembic
-itsdangerous==1.1.0       # via flask
-jinja2==2.11.3            # via flask
+itsdangerous==2.1.2       # via flask
+jinja2==3.1.1             # via flask
 jsonpickle==2.1.0         # via reana-workflow-controller (setup.py)
 jsonpointer==2.2          # via jsonschema
 jsonref==0.2              # via bravado-core
@@ -51,8 +51,8 @@ pyrsistent==0.18.1        # via jsonschema
 python-dateutil==2.8.2    # via bravado, bravado-core, kubernetes
 pytz==2022.1              # via bravado-core, fs
 pyyaml==5.4.1             # via bravado, bravado-core, kubernetes, reana-commons, swagger-spec-validator
-reana-commons[kubernetes]==0.9.0a6	# via reana-db, reana-workflow-controller (setup.py)
-reana-db==0.9.0a5	# via reana-workflow-controller (setup.py)
+reana-commons[kubernetes]==0.9.0a6  # via reana-db, reana-workflow-controller (setup.py)
+reana-db==0.9.0a5         # via reana-workflow-controller (setup.py)
 requests-oauthlib==1.3.1  # via kubernetes
 requests==2.25.0          # via bravado, kubernetes, reana-workflow-controller (setup.py), requests-oauthlib
 rfc3987==1.3.8            # via jsonschema
@@ -73,7 +73,7 @@ vine==5.0.0               # via amqp, kombu
 webargs==6.1.1            # via reana-workflow-controller (setup.py)
 webcolors==1.11.1         # via jsonschema
 websocket-client==1.3.2   # via kubernetes
-werkzeug==1.0.1           # via flask, reana-commons, reana-workflow-controller (setup.py)
+werkzeug==2.1.0           # via flask, reana-commons, reana-workflow-controller (setup.py)
 zipp==3.7.0               # via importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/setup.py b/setup.py
@@ -50,9 +50,9 @@
 ]
 
 install_requires = [
-    "Flask>=1.0.4,<2.0",
+    "Flask>=2.1.1",
     "MarkupSafe>=2.0.0,<2.1.0",
-    "Werkzeug>=1.0.1,<2.0",
+    "Werkzeug>=2.1.0",
     "gitpython>=2.1",
     "jsonpickle>=0.9.6",
     "marshmallow>2.13.0,<=2.20.1",