Merge pull request #227 from communitiesuk/FS-4561-upgrade-dependencies

FS-4561: Upgrade dependencies

.env.development

@@ -1,4 +1,4 @@
-FLASK_APP=app.py
+FLASK_APP=app:application
 FLASK_ENV=development
 FLASK_RUN_PORT=5000
 FLASK_RUN_HOST=localhost

.flaskenv

@@ -1,4 +1,4 @@
-FLASK_APP=app.py
+FLASK_APP=app:application
 FLASK_ENV=development
 FLASK_RUN_PORT=5000
 FLASK_RUN_HOST=localhost

Dockerfile

@@ -4,8 +4,9 @@ WORKDIR /app
 COPY requirements-dev.txt requirements-dev.txt
 RUN pip --no-cache-dir install --ignore-installed distlib -r requirements-dev.txt
 RUN pip install gunicorn
+RUN pip install uvicorn
 COPY . .
 
 EXPOSE 8080
 
-CMD bash -c "flask db upgrade && gunicorn -w 1 -b 0.0.0.0:8080 app:create_app()"
+CMD ["gunicorn", "--worker-class", "uvicorn.workers.UvicornWorker", "wsgi:app", "-b", "0.0.0.0:8080"]

Procfile

@@ -1 +1 @@
-web: gunicorn wsgi:app -c run/gunicorn/devtest.py
+web: gunicorn --worker-class uvicorn.workers.UvicornWorker -c run/gunicorn/devtest.py wsgi:app

app.py

@@ -3,7 +3,7 @@
 """
 
 import connexion
-from flask import Flask
+from connexion import FlaskApp
 from fsd_utils import init_sentry
 from fsd_utils.healthchecks.checkers import DbChecker
 from fsd_utils.healthchecks.checkers import FlaskRunningChecker
@@ -15,13 +15,11 @@
 from db import migrate
 
 
-def create_app() -> Flask:
+def create_app() -> FlaskApp:
     init_sentry()
-    connexion_options = {"swagger_url": "/"}
     connexion_app = connexion.FlaskApp(
         __name__,
         specification_dir=Config.FLASK_ROOT + "/openapi/",
-        options=connexion_options,
     )
     connexion_app.add_api(Config.FLASK_ROOT + "/openapi/api.yml")
 
@@ -42,7 +40,9 @@ def create_app() -> Flask:
     health.add_check(FlaskRunningChecker())
     health.add_check(DbChecker(db))
 
-    return flask_app
+    return connexion_app
 
 
 app = create_app()
+
+application = app.app

requirements-dev.in

@@ -3,7 +3,7 @@ black
 debugpy
 deepdiff
 pre-commit
-pytest
+pytest>=8.3.1
 pytest-env
 pytest-flask
 pytest-mock