Merge branch 'main' into BAU_concurrency_workflow

communitiesuk · Nov 8, 2023 · e4ca002 · e4ca002
2 parents e4a7a8e + fdc8914
commit e4ca002
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 39 deletions.
diff --git a/.env.development b/.env.development
@@ -16,3 +16,5 @@ AWS_DLQ_IMPORT_APP_QUEUE_NAME=import-dlq
 AWS_DLQ_MAX_RECIEVE_COUNT=3
 AWS_SQS_IMPORT_APP_PRIMARY_QUEUE_URL=http://localhost:4566/000000000000/import-queue
 AWS_SQS_IMPORT_APP_SECONDARY_QUEUE_URL=http://localhost:4566/000000000000/import-queue-dlq
+
+SQLALCHEMY_WARN_20=1
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -27,6 +27,7 @@
       "module": "flask",
       "envFile": "${workspaceFolder}/.env.development",
       "args": ["run", "--no-debugger"],
+      "pythonArgs": ["-W always::DeprecationWarning"],
       "jinja": true,
       "justMyCode": true
     },

diff --git a/config/envs/default.py b/config/envs/default.py
@@ -97,3 +97,4 @@ class DefaultConfig:
 
     SQLALCHEMY_DATABASE_URI = environ.get("DATABASE_URL")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
+    SQLALCHEMY_ENGINE_OPTIONS = {"future": True}
diff --git a/db/models/application/applications.py b/db/models/application/applications.py
@@ -3,7 +3,7 @@
 from db import db
 from db.models.application.enums import Language
 from db.models.application.enums import Status
-from flask_sqlalchemy import DefaultMeta
+from flask_sqlalchemy.model import DefaultMeta
 from sqlalchemy import Column
 from sqlalchemy import DateTime
 from sqlalchemy.dialects.postgresql import ENUM

diff --git a/db/models/feedback/end_of_application_survey.py b/db/models/feedback/end_of_application_survey.py
@@ -1,5 +1,5 @@
 from db import db
-from flask_sqlalchemy import DefaultMeta
+from flask_sqlalchemy.model import DefaultMeta
 from sqlalchemy import DateTime
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.sql import func

diff --git a/db/models/feedback/feedback.py b/db/models/feedback/feedback.py
@@ -3,7 +3,7 @@
 from db import db
 from db.models.application.applications import Applications
 from db.models.application.enums import Status
-from flask_sqlalchemy import DefaultMeta
+from flask_sqlalchemy.model import DefaultMeta
 from sqlalchemy import DateTime
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.sql import func

diff --git a/db/models/forms/forms.py b/db/models/forms/forms.py
@@ -2,7 +2,7 @@
 
 from db import db
 from db.models.application.applications import Applications
-from flask_sqlalchemy import DefaultMeta
+from flask_sqlalchemy.model import DefaultMeta
 from sqlalchemy_json import NestedMutableJson
 from sqlalchemy_utils.types import UUIDType
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements-dev.in
 #
-alembic==1.8.1
+alembic==1.12.1
     # via
     #   -r requirements.txt
     #   flask-migrate
@@ -132,7 +132,7 @@ flask-babel==2.0.0
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
-flask-migrate==4.0.0
+flask-migrate==4.0.5
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
@@ -151,16 +151,12 @@ flipper-client==1.3.1
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
-funding-service-design-utils==2.0.30
+funding-service-design-utils==2.0.32
     # via -r requirements.txt
 gitdb==4.0.9
     # via gitpython
-gitpython==3.1.30
+gitpython==3.1.37
     # via bandit
-greenlet==2.0.2
-    # via
-    #   -r requirements.txt
-    #   sqlalchemy
 gunicorn==20.1.0
     # via
     #   -r requirements.txt
@@ -236,7 +232,7 @@ marshmallow==3.19.0
     # via
     #   -r requirements.txt
     #   marshmallow-sqlalchemy
-marshmallow-sqlalchemy==0.28.1
+marshmallow-sqlalchemy==0.29.0
     # via -r requirements.txt
 mypy-extensions==0.4.3
     # via black
@@ -314,6 +310,7 @@ pyjwt[crypto]==2.6.0
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
+    #   pyjwt
 pyparsing==3.0.9
     # via
     #   -r requirements.txt
@@ -405,14 +402,14 @@ sentry-sdk[flask]==1.32.0
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
+    #   sentry-sdk
 six==1.16.0
     # via
     #   -r requirements.txt
     #   jsonpath-rw
     #   prance
     #   python-consul
     #   python-dateutil
-    #   sqlalchemy-json
     #   thrift
 slugify==0.0.1
     # via -r requirements.txt
@@ -422,17 +419,17 @@ soupsieve==2.4.1
     # via
     #   -r requirements.txt
     #   beautifulsoup4
-sqlalchemy==1.4.44
+sqlalchemy==2.0.23
     # via
     #   -r requirements.txt
     #   alembic
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   sqlalchemy-json
     #   sqlalchemy-utils
-sqlalchemy-json==0.5.0
+sqlalchemy-json==0.7.0
     # via -r requirements.txt
-sqlalchemy-utils==0.38.3
+sqlalchemy-utils==0.41.1
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
@@ -455,12 +452,14 @@ tomli==2.0.1
 typing-extensions==4.4.0
     # via
     #   -r requirements.txt
+    #   alembic
     #   jsonschema-spec
+    #   sqlalchemy
 tzdata==2023.3
     # via
     #   -r requirements.txt
     #   pandas
-urllib3==1.26.12
+urllib3==1.26.18
     # via
     #   -r requirements.txt
     #   botocore

diff --git a/requirements.in b/requirements.in
@@ -1,6 +1,6 @@
 connexion
 flask_restx
-funding-service-design-utils>=2.0.18,<2.1.0
+funding-service-design-utils>=2.0.32,<2.1.0
 openapi-spec-validator
 prance
 requests
@@ -16,10 +16,10 @@ openpyxl
 #-----------------------------------
 #   Database
 #-----------------------------------
-SQLAlchemy
+SQLAlchemy>=2.0.23
 Flask-SQLAlchemy>=3.0.3
-Flask-Migrate
-sqlalchemy-utils
-sqlalchemy_json
+Flask-Migrate>=4.0.5
+sqlalchemy-utils>=0.41.1
+sqlalchemy_json>=0.7.0
 psycopg2-binary==2.9.6
-marshmallow-sqlalchemy
+marshmallow-sqlalchemy>=0.29.0
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements.in
 #
-alembic==1.8.1
+alembic==1.12.1
     # via flask-migrate
 aniso8601==9.0.1
     # via flask-restx
@@ -68,7 +68,7 @@ flask==2.2.2
     #   sentry-sdk
 flask-babel==2.0.0
     # via funding-service-design-utils
-flask-migrate==4.0.0
+flask-migrate==4.0.5
     # via
     #   -r requirements.in
     #   funding-service-design-utils
@@ -83,10 +83,8 @@ flask-sqlalchemy==3.0.3
     #   funding-service-design-utils
 flipper-client==1.3.1
     # via funding-service-design-utils
-funding-service-design-utils==2.0.30
-    # via -r requirements.txt
-greenlet==2.0.2
-    # via sqlalchemy
+funding-service-design-utils==2.0.32
+    # via -r requirements.in
 gunicorn==20.1.0
     # via funding-service-design-utils
 idna==3.4
@@ -135,7 +133,7 @@ markupsafe==2.1.1
     #   werkzeug
 marshmallow==3.19.0
     # via marshmallow-sqlalchemy
-marshmallow-sqlalchemy==0.28.1
+marshmallow-sqlalchemy==0.29.0
     # via -r requirements.in
 numpy==1.26.0
     # via pandas
@@ -170,7 +168,9 @@ pyee==6.0.0
 pygments==2.14.0
     # via rich
 pyjwt[crypto]==2.6.0
-    # via funding-service-design-utils
+    # via
+    #   funding-service-design-utils
+    #   pyjwt
 pyparsing==3.0.9
     # via packaging
 pyrsistent==0.19.2
@@ -222,30 +222,31 @@ s3transfer==0.6.0
 semver==2.13.0
     # via prance
 sentry-sdk[flask]==1.32.0
-    # via funding-service-design-utils
+    # via
+    #   funding-service-design-utils
+    #   sentry-sdk
 six==1.16.0
     # via
     #   jsonpath-rw
     #   prance
     #   python-consul
     #   python-dateutil
-    #   sqlalchemy-json
     #   thrift
 slugify==0.0.1
     # via -r requirements.in
 soupsieve==2.4.1
     # via beautifulsoup4
-sqlalchemy==1.4.44
+sqlalchemy==2.0.23
     # via
     #   -r requirements.in
     #   alembic
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   sqlalchemy-json
     #   sqlalchemy-utils
-sqlalchemy-json==0.5.0
+sqlalchemy-json==0.7.0
     # via -r requirements.in
-sqlalchemy-utils==0.38.3
+sqlalchemy-utils==0.41.1
     # via
     #   -r requirements.in
     #   funding-service-design-utils
@@ -254,10 +255,13 @@ swagger-ui-bundle==0.0.9
 thrift==0.16.0
     # via flipper-client
 typing-extensions==4.4.0
-    # via jsonschema-spec
+    # via
+    #   alembic
+    #   jsonschema-spec
+    #   sqlalchemy
 tzdata==2023.3
     # via pandas
-urllib3==1.26.12
+urllib3==1.26.18
     # via
     #   botocore
     #   requests
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,3 +97,4 @@ class DefaultConfig:

		SQLALCHEMY_DATABASE_URI = environ.get("DATABASE_URL")
		SQLALCHEMY_TRACK_MODIFICATIONS = False
		SQLALCHEMY_ENGINE_OPTIONS = {"future": True}