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 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