Skip to content

Commit a079695

Browse files
committed
Hotfix marshmallow
1 parent 67abf16 commit a079695

10 files changed

Lines changed: 16 additions & 16 deletions

File tree

analytics-api/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ charset-normalizer==3.1.0
2323
click==8.1.7
2424
ecdsa==0.19.2
2525
flask_jwt_oidc==0.8.0
26-
flask-marshmallow==1.0.0
26+
flask-marshmallow==1.3.0
2727
flask-restx==1.3.2
2828
gunicorn==23.0.0
2929
idna==3.7
@@ -33,7 +33,7 @@ itsdangerous==2.2.0
3333
jaeger-client==4.8.0
3434
jsonschema==4.21.1
3535
marshmallow-sqlalchemy==1.0.0
36-
marshmallow==3.26.2
36+
marshmallow==4.3.0
3737
opentracing==2.4.0
3838
packaging==23.0
3939
pkgutil_resolve_name==1.3.10

analytics-api/requirements/prod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Flask-Moment
77
Flask-SQLAlchemy
88
SQLAlchemy-Continuum
99
flask-restx
10-
flask-marshmallow==1.0.0
10+
flask-marshmallow==1.3.0
1111
flask-jwt-oidc
1212
python-dotenv
1313
psycopg2-binary

api/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ attrs==23.2.0
55
click==8.1.7
66
flasgger==0.9.5
77
Flask==3.1.3
8-
flask-marshmallow==1.0.0
8+
flask-marshmallow==1.3.0
99
Flask-Migrate==2.7.0
1010
flask-restplus==0.13.0
1111
Flask-SQLAlchemy==3.0.5
@@ -15,7 +15,7 @@ Jinja2==3.1.6
1515
jsonschema==4.21.1
1616
Mako==1.3.3
1717
MarkupSafe==2.1.5
18-
marshmallow==3.26.2
18+
marshmallow==4.3.0
1919
marshmallow-sqlalchemy==1.0.0
2020
mistune==2.0.3
2121
psycopg2-binary==2.9.9

api/requirements/prod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Flask-Moment
77
Flask-SQLAlchemy
88
SQLAlchemy-Continuum
99
flask-restx
10-
flask-marshmallow==1.0.0
10+
flask-marshmallow==1.3.0
1111
flask-jwt-oidc
1212
python-dotenv
1313
psycopg2-binary

api/src/api/schemas/base_schema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class Meta: # pylint: disable=too-few-public-methods
4242
None) else None
4343
)
4444

45-
@post_dump(pass_many=True)
46-
def _remove_empty(self, data, many):
45+
@post_dump(pass_collection=True)
46+
def _remove_empty(self, data, many, **kwargs):
4747
"""Remove all empty values and versions from the dumped dict."""
4848
if not many:
4949
for key in list(data):

api/src/api/schemas/suggested_engagement.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Meta:
2424
validate=validate.Range(min=1, error='sort_index must be 1 or greater'),
2525
)
2626

27-
@pre_load(pass_many=True)
27+
@pre_load(pass_collection=True)
2828
def normalize_sort_index(self, data, many, **kwargs):
2929
"""Normalize sort_index from payload order when omitted."""
3030
rows = data if many else [data]
@@ -35,7 +35,7 @@ def normalize_sort_index(self, data, many, **kwargs):
3535
normalized_rows.append(item)
3636
return normalized_rows if many else normalized_rows[0]
3737

38-
@validates_schema(pass_many=True)
38+
@validates_schema(pass_collection=True)
3939
def validate_uniqueness(self, data, many, **kwargs):
4040
"""Ensure payload does not contain duplicate slots or duplicate targets."""
4141
rows = data if many else [data]

cron/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ click==8.3.1
2626
cryptography==46.0.7
2727
flask-cors==6.0.1
2828
flask-jwt-oidc==0.9.0
29-
flask-marshmallow==1.0.0
29+
flask-marshmallow==1.3.0
3030
flask-restx==1.3.2
3131
greenlet==3.3.2
3232
gunicorn==25.3.0
@@ -37,7 +37,7 @@ jaeger-client==4.8.0
3737
jsonschema-specifications==2025.9.1
3838
jsonschema==4.26.0
3939
marshmallow-sqlalchemy==1.0.0
40-
marshmallow==3.26.2
40+
marshmallow==4.3.0
4141
opentracing==2.4.0
4242
packaging==26.0
4343
psycopg2-binary==2.9.11

cron/requirements/prod.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Flask-Script==2.0.5
66
Flask-Moment
77
Flask-SQLAlchemy
88
flask-restx
9-
flask-marshmallow==1.0.0
9+
flask-marshmallow==1.3.0
1010
flask-jwt-oidc
1111
python-dotenv
1212
psycopg2-binary

etl/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ flask-restx==1.3.0
44
flask-moment==1.0.6
55
flask-jwt-oidc==0.9.0
66
Werkzeug==3.1.6
7-
marshmallow==3.26.2
7+
marshmallow==4.3.0
88
marshmallow-sqlalchemy==1.0.0
99
dagster==1.10.16
1010
dagit==1.10.16

notify-api/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ attrs==23.2.0
55
click==8.1.7
66
flasgger==0.9.5
77
Flask==2.3.3
8-
flask-marshmallow==1.0.0
8+
flask-marshmallow==1.3.0
99
Flask-Migrate==2.7.0
1010
Flask-Script==2.0.5
1111
flask-restplus==0.13.0
@@ -16,7 +16,7 @@ Jinja2==3.1.6
1616
jsonschema==4.21.1
1717
Mako==1.3.3
1818
MarkupSafe==2.1.5
19-
marshmallow==3.26.2
19+
marshmallow==4.3.0
2020
marshmallow-sqlalchemy==1.0.0
2121
mistune==2.0.3
2222
psycopg2-binary==2.9.9

0 commit comments

Comments
 (0)