diff --git a/condabuild/meta.yaml b/condabuild/meta.yaml index 826fb1d79..d1415f7eb 100644 --- a/condabuild/meta.yaml +++ b/condabuild/meta.yaml @@ -16,13 +16,13 @@ requirements: - numpy {{ environ.get('FACET_V_NUMPY') }} - flit =3 run: - - joblib {{ environ.get('FACET_V_JOBLIB') }} - - matplotlib {{ environ.get('FACET_V_MATPLOTLIB') }} - - numpy {{ environ.get('FACET_V_NUMPY') }} - - pandas {{ environ.get('FACET_V_PANDAS') }} - - python {{ environ.get('FACET_V_PYTHON') }} - - scipy {{ environ.get('FACET_V_SCIPY') }} - - typing_inspect {{ environ.get('FACET_V_TYPING_INSPECT') }} + - joblib {{ environ.get('FACET_V_JOBLIB') }} + - matplotlib-base {{ environ.get('FACET_V_MATPLOTLIB') }} + - numpy {{ environ.get('FACET_V_NUMPY') }} + - pandas {{ environ.get('FACET_V_PANDAS') }} + - python {{ environ.get('FACET_V_PYTHON') }} + - scipy {{ environ.get('FACET_V_SCIPY') }} + - typing_inspect {{ environ.get('FACET_V_TYPING_INSPECT') }} test: imports: - pytools diff --git a/pyproject.toml b/pyproject.toml index 26c5f29c8..5587979b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,12 +14,12 @@ dist-name = "gamma-pytools" license = "Apache Software License v2.0" requires = [ - "joblib >=0.14,<1.1a", + "joblib >=0.14,<2a", "matplotlib ~=3.0", - "numpy >=1.16,<1.21a", + "numpy >=1.16,<2a", "pandas >=0.24,<2a", "scipy ~=1.2", - "typing_inspect >=0.4", + "typing_inspect ~=0.4", ] requires-python = ">=3.6,<4a" @@ -81,7 +81,7 @@ numpy = ">=1.20,<2a" # cannot use ~= due to conda bug pandas = "~=1.2" python = ">=3.8,<4a" # cannot use ~= due to conda bug scipy = "~=1.6" -typing_inspect = ">=0.7" +typing_inspect = "~=0.7" [tool.black] # quiet = "True"