From aa7a825e4fdde5e86f931479afa5c03354395525 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 16:46:59 +0000 Subject: [PATCH] Bump sqlalchemy from 1.3.24 to 2.0.1 Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.3.24 to 2.0.1. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES.rst) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) --- updated-dependencies: - dependency-name: sqlalchemy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-dev.in | 2 +- requirements-dev.txt | 6 +++++- requirements-docs.in | 2 +- requirements-docs.txt | 11 +++++++++-- requirements-tests.in | 2 +- requirements-tests.txt | 10 ++++++---- requirements.in | 2 +- requirements.txt | 6 +++++- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index 2b045fa337..79147c5eb2 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -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 \ No newline at end of file +sqlalchemy < 2.1.0 # ImportError: cannot import name '_ColumnEntity' https://github.com/sqlalchemy/sqlalchemy/issues/6226 \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt index ef2d5005c1..9c6863bca7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 @@ -96,7 +98,7 @@ six==1.16.0 # via # bleach # virtualenv -sqlalchemy==1.3.24 +sqlalchemy==2.0.1 # via # -r requirements-dev.in # marshmallow-sqlalchemy @@ -104,6 +106,8 @@ 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 diff --git a/requirements-docs.in b/requirements-docs.in index 4d3e21a777..83a769c59b 100644 --- a/requirements-docs.in +++ b/requirements-docs.in @@ -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 diff --git a/requirements-docs.txt b/requirements-docs.txt index 84fee1cb49..2eb7890d7e 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements-tests.in b/requirements-tests.in index f4cf754f60..e881923441 100644 --- a/requirements-tests.in +++ b/requirements-tests.in @@ -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 \ No newline at end of file diff --git a/requirements-tests.txt b/requirements-tests.txt index 3850c78c10..c1724f0172 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements.in b/requirements.in index 3c6cf734dd..548acc6540 100644 --- a/requirements.in +++ b/requirements.in @@ -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 diff --git a/requirements.txt b/requirements.txt index e1ee8708cb..b5e53e1d5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 @@ -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 @@ -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