From cee69a8e4024a78e0065cb4b302ae8b02d2135a2 Mon Sep 17 00:00:00 2001 From: Oliver Beckstein Date: Fri, 15 Sep 2023 11:22:21 -0400 Subject: [PATCH] dependency cleanup - install matplotlib instead of matplotlib-base for Python 2.7 (also works in 3) - used same version pins in setup.py and test_env.yaml - removed numpy from testing dep in setup.py as it is a package dep --- ci/conda-envs/test_env.yaml | 7 +++---- setup.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/conda-envs/test_env.yaml b/ci/conda-envs/test_env.yaml index 6981b7e3..e7d61b77 100644 --- a/ci/conda-envs/test_env.yaml +++ b/ci/conda-envs/test_env.yaml @@ -5,8 +5,7 @@ channels: dependencies: - python - six -- numpy -- scipy -- matplotlib-base -- pandas +- numpy>=1.0 +- matplotlib +- pandas>=0.17 - numkit \ No newline at end of file diff --git a/setup.py b/setup.py index 175dd7b5..34861230 100644 --- a/setup.py +++ b/setup.py @@ -66,6 +66,6 @@ 'numkit', # numerical helpers 'matplotlib', ], - tests_require=['pytest', 'numpy>=1.0', 'pandas>=0.17'], + tests_require=['pytest', 'pandas>=0.17'], zip_safe=True, )