From 7cf687282f7ca12679496800d91521e9e7cd3cc6 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Wed, 21 Aug 2024 11:03:25 -0400 Subject: [PATCH 1/2] Limit marshmallow version to work around paramtools bug --- environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index f914ebc27..bf9bf569e 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,8 @@ dependencies: - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" -- "paramtools>=0.18.2" +- "marshmallow<3.22" # to work around paramtools bug +- "paramtools>=0.18.2" # requires marshmallow>=3.0 - numba - curl - pytest From 59250cafdd673f27e6aeff85caf94bb75e138278 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Wed, 21 Aug 2024 11:31:40 -0400 Subject: [PATCH 2/2] Update conda.recipe/meta.yaml to correspond to environment.yml --- conda.recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index a316d710a..3d335ee14 100755 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -12,7 +12,8 @@ requirements: - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" - - "paramtools>=0.18.2" + - "marshmallow<3.22" # to work around paramtools bug + - "paramtools>=0.18.2" # requires marshmallow>=3.0 - numba - curl - openpyxl @@ -23,7 +24,8 @@ requirements: - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" - - "paramtools>=0.18.2" + - "marshmallow<3.22" # to work around paramtools bug + - "paramtools>=0.18.2" # requires marshmallow>=3.0 - numba - curl - openpyxl