diff --git a/backend/migration_reset.py b/backend/migration_reset.py index 4f674c75ecff4e31ccf744818978580270e4ef48..79281ba19d963b8d10755c6d8f52d84df2689f12 100644 --- a/backend/migration_reset.py +++ b/backend/migration_reset.py @@ -1,4 +1,4 @@ -from sqlalchemy import exc +from sqlalchemy import exc, text from database import db import logging @@ -17,7 +17,7 @@ def reset(): logging.info("Checking if alembic version needs to be reset.") version = None try: - result = db.session.execute("select version_num from alembic_version") + result = db.session.execute(text("select version_num from alembic_version")) for row in result: version = row[0] except exc.ProgrammingError: diff --git a/backend/requirements.in b/backend/requirements.in index 1a3f97f469c4b3ab2462ebf170c61f87e303143e..6404b52f49ca6219588b8609fb10adac559f910b 100644 --- a/backend/requirements.in +++ b/backend/requirements.in @@ -1,22 +1,21 @@ APScheduler==3.9.1 -charset-normalizer==2.0.12 # CLI creation kit -click==8.0.4 -Flask==2.0.3 -Flask-Cors==3.0.10 -flask-expects-json==1.7.0 -Flask-JWT-Extended==4.3.1 -Flask-Migrate==4.0.1 -Flask-SQLAlchemy==2.5.1 -pip-install==1.3.5 -jsonschema==4.4.0 -Jinja2==3.0.3 -jinja2-base64-filters==0.1.4 +click==8.1.7 +Flask==3.0.3 +# Flask-Cors==3.0.10 +# flask-expects-json==1.7.0 +Flask-JWT-Extended==4.6.0 +# Flask-Migrate==4.0.1 +Flask-SQLAlchemy==3.1.1 +# jsonschema==4.4.0 +# Jinja2==3.0.3 +# jinja2-base64-filters==0.1.4 kubernetes==24.2.0 +pymysql==1.0.2 NamedAtomicLock==1.1.3 -oauthlib==3.2.0 ory-kratos-client==1.0.0 ory-hydra-client==1.11.8 +pip-install==1.3.5 posix-ipc==1.1.1 PyYAML==6.0.1 regex==2022.3.15 diff --git a/backend/requirements.txt b/backend/requirements.txt index a830dd79c59f6645b27249de4b7f895744a23fac..576d3f8508887bdb05694cb355f3a3e1910a5944 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -4,12 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements.txt --strip-extras requirements.in # -alembic==1.13.2 - # via flask-migrate apscheduler==3.9.1 # via -r requirements.in -attrs==24.2.0 - # via jsonschema +blinker==1.8.2 + # via flask cachetools==5.5.0 # via google-auth certifi==2024.7.4 @@ -17,33 +15,20 @@ certifi==2024.7.4 # kubernetes # requests charset-normalizer==2.0.12 - # via - # -r requirements.in - # requests -click==8.0.4 + # via requests +click==8.1.7 # via # -r requirements.in # flask -flask==2.0.3 +flask==3.0.3 # via # -r requirements.in - # flask-cors - # flask-expects-json # flask-jwt-extended - # flask-migrate # flask-sqlalchemy -flask-cors==3.0.10 - # via -r requirements.in -flask-expects-json==1.7.0 +flask-jwt-extended==4.6.0 # via -r requirements.in -flask-jwt-extended==4.3.1 +flask-sqlalchemy==3.1.1 # via -r requirements.in -flask-migrate==4.0.1 - # via -r requirements.in -flask-sqlalchemy==2.5.1 - # via - # -r requirements.in - # flask-migrate google-auth==2.34.0 # via kubernetes greenlet==3.0.3 @@ -52,32 +37,18 @@ idna==3.7 # via requests itsdangerous==2.2.0 # via flask -jinja2==3.0.3 - # via - # -r requirements.in - # flask - # jinja2-base64-filters -jinja2-base64-filters==0.1.4 - # via -r requirements.in -jsonschema==4.4.0 - # via - # -r requirements.in - # flask-expects-json +jinja2==3.1.4 + # via flask kubernetes==24.2.0 # via -r requirements.in -mako==1.3.5 - # via alembic markupsafe==2.1.5 # via # jinja2 - # mako # werkzeug namedatomiclock==1.1.3 # via -r requirements.in -oauthlib==3.2.0 - # via - # -r requirements.in - # requests-oauthlib +oauthlib==3.2.2 + # via requests-oauthlib ory-hydra-client==1.11.8 # via -r requirements.in ory-kratos-client==1.0.0 @@ -94,8 +65,8 @@ pyasn1-modules==0.4.0 # via google-auth pyjwt==2.9.0 # via flask-jwt-extended -pyrsistent==0.20.0 - # via jsonschema +pymysql==1.0.2 + # via -r requirements.in python-dateutil==2.9.0.post0 # via # kubernetes @@ -123,17 +94,12 @@ rsa==4.9 six==1.16.0 # via # apscheduler - # flask-cors # kubernetes # python-dateutil sqlalchemy==2.0.32 - # via - # alembic - # flask-sqlalchemy + # via flask-sqlalchemy typing-extensions==4.12.2 - # via - # alembic - # sqlalchemy + # via sqlalchemy tzlocal==5.2 # via apscheduler urllib3==1.26.19