From 14fab404b3d161404788883588aeead1f3cfa90f Mon Sep 17 00:00:00 2001 From: James Kent Date: Mon, 21 Apr 2025 16:01:44 -0500 Subject: [PATCH 1/3] add marshmallow version requirement --- compose/neurosynth_compose/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/neurosynth_compose/requirements.txt b/compose/neurosynth_compose/requirements.txt index d9651a55d..9ff27325d 100644 --- a/compose/neurosynth_compose/requirements.txt +++ b/compose/neurosynth_compose/requirements.txt @@ -16,6 +16,7 @@ flask-sqlalchemy~=3.0 gunicorn~=22.0 httpx~=0.22 ipython~=7.19 +marshmallow~3.0 pandas~=2.0 pip-chill~=1.0 psycopg2-binary~=2.8 From 8f2a1ba9372813a8a710a0141551cc33ab739641 Mon Sep 17 00:00:00 2001 From: James Kent Date: Mon, 21 Apr 2025 16:08:31 -0500 Subject: [PATCH 2/3] add missing equals --- compose/neurosynth_compose/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/neurosynth_compose/requirements.txt b/compose/neurosynth_compose/requirements.txt index 9ff27325d..0d6c5da3b 100644 --- a/compose/neurosynth_compose/requirements.txt +++ b/compose/neurosynth_compose/requirements.txt @@ -16,7 +16,7 @@ flask-sqlalchemy~=3.0 gunicorn~=22.0 httpx~=0.22 ipython~=7.19 -marshmallow~3.0 +marshmallow~=3.0 pandas~=2.0 pip-chill~=1.0 psycopg2-binary~=2.8 From 8f8a716139ed8db4e897ff4b1b1ec73deb1d2a43 Mon Sep 17 00:00:00 2001 From: Nicholas Lee Date: Mon, 21 Apr 2025 18:31:28 -0700 Subject: [PATCH 3/3] feat: pin marshmallow versioning for neurostore --- compose/setup.py | 2 +- store/neurostore/requirements.txt | 1 + store/setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compose/setup.py b/compose/setup.py index 33975c323..f617b2820 100644 --- a/compose/setup.py +++ b/compose/setup.py @@ -12,7 +12,7 @@ "flask-cors", "flask-sqlalchemy", "pyld", - "marshmallow>=3.0.0", + "marshmallow~=3.0.0", "webargs", "shortuuid", "pandas", diff --git a/store/neurostore/requirements.txt b/store/neurostore/requirements.txt index d60ae765d..ba60c101c 100644 --- a/store/neurostore/requirements.txt +++ b/store/neurostore/requirements.txt @@ -12,6 +12,7 @@ flask-migrate~=2.5 flask-sqlalchemy~=3.1 # fix multiple instance error: https://flask-sqlalchemy.palletsprojects.com/en/3.0.x/changes/#version-3-0-3 gunicorn~=22.0 ipython~=7.19 +marshmallow<4.0.0 numpy<2.0.0 pandas~=1.2 pip-chill~=1.0 diff --git a/store/setup.py b/store/setup.py index 4c57925b9..935810045 100644 --- a/store/setup.py +++ b/store/setup.py @@ -12,7 +12,7 @@ "flask-sqlalchemy", "pyld", "flask-graphql", - "marshmallow>=3.0.0", + "marshmallow<4.0.0", "webargs", "shortuuid", "pandas",