Fixed merge conflict with main

This commit is contained in:
alexjanousekGSA
2025-06-04 11:07:24 -04:00
5 changed files with 121 additions and 37 deletions

View File

@@ -8,14 +8,14 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "^3.12.2"
python = "^3.13.2"
alembic = "==1.16.1"
amqp = "==5.3.1"
beautifulsoup4 = "==4.13.4"
boto3 = "^1.38.27"
botocore = "^1.38.27"
cachetools = "==6.0.0"
celery = {version = "==5.5.2", extras = ["redis"]}
celery = {version = "==5.5.3", extras = ["redis"]}
certifi = ">=2022.12.7"
cffi = "==1.17.1"
charset-normalizer = "^3.4.2"
@@ -24,8 +24,8 @@ click-datetime = "==0.4.0"
click-didyoumean = "==0.3.1"
click-plugins = "==1.1.1"
click-repl = "==0.3.0"
deprecated = "^1.2.18"
eventlet = "^0.40.0"
deprecated = "==1.2.14"
eventlet = "==0.40.0"
expiringdict = "==1.2.2"
flask = "~=3.1"
flask-bcrypt = "==1.0.1"
@@ -43,7 +43,7 @@ notifications-python-client = "==10.0.1"
oscrypto = { git = "https://github.com/wbond/oscrypto.git", rev = "1547f53" }
packaging = "==25.0"
poetry-dotenv-plugin = "==0.2.0"
psycopg2-binary = "^2.9.10"
psycopg2-binary = "==2.9.10"
pyjwt = "==2.10.1"
python-dotenv = "==1.1.0"
sqlalchemy = "==2.0.41"
@@ -101,7 +101,7 @@ jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
moto = "==5.1.5"
pip-audit = "*"
pre-commit = "^4.2.0"
pytest = "^8.3.2"
pytest = "^8.4.0"
pytest-env = "^1.1.3"
pytest-mock = "^3.14.1"
pytest-cov = "^6.1.1"