diff --git a/requirements-dev.in b/requirements-dev.in index 2b045fa337..a6fee2a47c 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -5,7 +5,7 @@ pre-commit invoke twine marshmallow-sqlalchemy == 0.23.1 #related to the marshmallow issue (to avoid conflicts) -marshmallow<2.21.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 +marshmallow<3.19.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 diff --git a/requirements-dev.txt b/requirements-dev.txt index ef2d5005c1..a6af4f5279 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -42,7 +42,7 @@ jeepney==0.8.0 # secretstorage keyring==23.5.0 # via twine -marshmallow==2.21.0 +marshmallow==3.19.0 # via # -r requirements-dev.in # marshmallow-sqlalchemy @@ -55,7 +55,9 @@ nodeenv==1.7.0 # -r requirements-dev.in # pre-commit packaging==21.3 - # via bleach + # via + # bleach + # marshmallow pkginfo==1.8.2 # via twine platformdirs==2.5.1 diff --git a/requirements-docs.in b/requirements-docs.in index 4d3e21a777..56461c53fc 100644 --- a/requirements-docs.in +++ b/requirements-docs.in @@ -32,7 +32,7 @@ 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 -marshmallow<2.21.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 +marshmallow<3.19.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 paramiko # required for the SFTP destination plugin pem pyjks >= 19 # pyjks < 19 depends on pycryptodome, which conflicts with dyn's usage of pycrypto diff --git a/requirements-docs.txt b/requirements-docs.txt index 84fee1cb49..97c2ea1a9c 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -315,7 +315,7 @@ markupsafe==2.1.1 # jinja2 # mako # moto -marshmallow==2.21.0 +marshmallow==3.19.0 # via # -r requirements-docs.in # -r requirements-tests.txt @@ -339,6 +339,7 @@ nose==1.3.7 packaging==21.3 # via # -r requirements-tests.txt + # marshmallow # pytest # redis # sphinx @@ -578,7 +579,6 @@ tabulate==0.8.10 tomli==2.0.1 # via # -r requirements-tests.txt - # black # pytest twofish==0.3.0 # via pyjks diff --git a/requirements-tests.in b/requirements-tests.in index f4cf754f60..177987f41a 100644 --- a/requirements-tests.in +++ b/requirements-tests.in @@ -13,7 +13,7 @@ freezegun itsdangerous < 2.1.0 # requires Flask 2.0.3 jinja2 < 3.1.0 # requires a newer version of Flask marshmallow-sqlalchemy == 0.23.1 #related to the marshmallow issue (to avoid conflicts) -marshmallow<2.21.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 +marshmallow<3.19.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 moto[all] == 3.1.1 # 3.1.2 breaks ELBv2 tests nose pyflakes diff --git a/requirements-tests.txt b/requirements-tests.txt index 3850c78c10..6edd157cef 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -148,7 +148,7 @@ markupsafe==2.1.1 # jinja2 # mako # moto -marshmallow==2.21.0 +marshmallow==3.19.0 # via # -r requirements-tests.in # marshmallow-sqlalchemy @@ -164,6 +164,7 @@ nose==1.3.7 # via -r requirements-tests.in packaging==21.3 # via + # marshmallow # pytest # redis parsedatetime==2.6 @@ -279,9 +280,7 @@ sshpubkeys==3.3.1 stevedore==3.5.0 # via bandit tomli==2.0.1 - # via - # black - # pytest + # via pytest urllib3==1.26.9 # via # botocore diff --git a/requirements.in b/requirements.in index 3c6cf734dd..59f0035b88 100644 --- a/requirements.in +++ b/requirements.in @@ -33,7 +33,7 @@ jinja2 < 3.1.0 # requires a newer version of Flask lockfile logmatic-python marshmallow-sqlalchemy == 0.23.1 #related to the marshmallow issue (to avoid conflicts) -marshmallow<2.21.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 +marshmallow<3.19.1 #schema duplicate issues https://github.com/marshmallow-code/marshmallow-sqlalchemy/issues/121 ndg-httpsclient paramiko # required for the SFTP destination plugin pem diff --git a/requirements.txt b/requirements.txt index e1ee8708cb..5c00dc0076 100644 --- a/requirements.txt +++ b/requirements.txt @@ -173,7 +173,7 @@ markupsafe==2.1.1 # via # jinja2 # mako -marshmallow==2.21.0 +marshmallow==3.19.0 # via # -r requirements.in # marshmallow-sqlalchemy @@ -182,7 +182,9 @@ marshmallow-sqlalchemy==0.23.1 ndg-httpsclient==0.5.1 # via -r requirements.in packaging==21.3 - # via redis + # via + # marshmallow + # redis paramiko==2.11.0 # via -r requirements.in parsedatetime==2.6