Skip to content

Bump marshmallow from 2.21.0 to 3.19.0 #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump marshmallow from 2.21.0 to 3.19.0 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-docs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements-docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -339,6 +339,7 @@ nose==1.3.7
packaging==21.3
# via
# -r requirements-tests.txt
# marshmallow
# pytest
# redis
# sphinx
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-tests.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions requirements-tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -164,6 +164,7 @@ nose==1.3.7
# via -r requirements-tests.in
packaging==21.3
# via
# marshmallow
# pytest
# redis
parsedatetime==2.6
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down