Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ marshmallow-sqlalchemy == 0.23.1 #related to the marshmallow issue (to avoid con
marshmallow<2.21.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121
nodeenv
pyyaml>=4.2b1
sqlalchemy < 1.4.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
sqlalchemy < 2.1.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
6 changes: 5 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ filelock==3.6.0
# via virtualenv
flake8==4.0.1
# via -r requirements-dev.in
greenlet==2.0.2
# via sqlalchemy
identify==2.4.12
# via pre-commit
idna==3.3
Expand Down Expand Up @@ -96,14 +98,16 @@ six==1.16.0
# via
# bleach
# virtualenv
sqlalchemy==1.3.24
sqlalchemy==2.0.1
# via
# -r requirements-dev.in
# marshmallow-sqlalchemy
toml==0.10.2
# via pre-commit
twine==4.0.1
# via -r requirements-dev.in
typing-extensions==4.4.0
# via sqlalchemy
urllib3==1.26.9
# via
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements-docs.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ itsdangerous < 2.1.0 # requires Flask 2.0.3
josepy
logmatic-python
marshmallow-sqlalchemy == 0.23.1 #related to the marshmallow issue (to avoid conflicts, as newer versions require marshmallow>=3.0.0)
sqlalchemy < 1.4.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
sqlalchemy < 2.1.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
marshmallow<2.21.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121
paramiko # required for the SFTP destination plugin
pem
Expand Down
11 changes: 9 additions & 2 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ graphql-core==3.2.0
# via
# -r requirements-tests.txt
# moto
greenlet==2.0.2
# via
# -r requirements-tests.txt
# sqlalchemy
gunicorn==20.1.0
# via -r requirements-docs.in
hvac==0.11.2
Expand Down Expand Up @@ -555,7 +559,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sqlalchemy==1.3.24
sqlalchemy==2.0.1
# via
# -r requirements-docs.in
# -r requirements-tests.txt
Expand All @@ -578,10 +582,13 @@ tabulate==0.8.10
tomli==2.0.1
# via
# -r requirements-tests.txt
# black
# pytest
twofish==0.3.0
# via pyjks
typing-extensions==4.4.0
# via
# -r requirements-tests.txt
# sqlalchemy
urllib3==1.26.9
# via
# -r requirements-tests.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements-tests.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ pytest-flask
pytest-mock
redis < 4.4.0 # requires a newer release of fakeredis
requests-mock
sqlalchemy < 1.4.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
sqlalchemy < 2.1.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
pyyaml>=4.2b1
werkzeug < 2.1.0 # requires a newer version of Flask
10 changes: 6 additions & 4 deletions requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ gitpython==3.1.27
# via bandit
graphql-core==3.2.0
# via moto
greenlet==2.0.2
# via sqlalchemy
idna==3.3
# via
# moto
Expand Down Expand Up @@ -268,7 +270,7 @@ smmap==5.0.0
# via gitdb
sortedcontainers==2.4.0
# via fakeredis
sqlalchemy==1.3.24
sqlalchemy==2.0.1
# via
# -r requirements-tests.in
# alembic
Expand All @@ -279,9 +281,9 @@ sshpubkeys==3.3.1
stevedore==3.5.0
# via bandit
tomli==2.0.1
# via
# black
# pytest
# via pytest
typing-extensions==4.4.0
# via sqlalchemy
urllib3==1.26.9
# via
# botocore
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ retrying
sentry-sdk
six
SQLAlchemy-Utils
sqlalchemy < 1.4.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
sqlalchemy < 2.1.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226
tabulate
validators
werkzeug < 2.1.0 # requires a newer version of Flask
Expand Down
6 changes: 5 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ flask-sqlalchemy==2.5.1
# flask-migrate
future==0.18.2
# via -r requirements.in
greenlet==2.0.2
# via sqlalchemy
gunicorn==20.1.0
# via -r requirements.in
hvac==0.11.2
Expand Down Expand Up @@ -278,7 +280,7 @@ six==1.16.0
# retrying
soupsieve==2.3.1
# via beautifulsoup4
sqlalchemy==1.3.24
sqlalchemy==2.0.1
# via
# -r requirements.in
# alembic
Expand All @@ -291,6 +293,8 @@ tabulate==0.8.10
# via -r requirements.in
twofish==0.3.0
# via pyjks
typing-extensions==4.4.0
# via sqlalchemy
urllib3==1.26.9
# via
# botocore
Expand Down