From 3578bcfb44f08abbb1055de6e64b256e48cb22ee Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Wed, 14 Feb 2018 09:26:47 +0000 Subject: [PATCH] Improved the pip installability of scitools-iris. --- requirements/core.txt | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/core.txt b/requirements/core.txt index d2540da9f1..a078710396 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -7,6 +7,7 @@ cartopy matplotlib<1.9 netcdf4 numpy +scipy # pyke (not pip installable) #conda: pyke cf_units dask>=0.15.0 diff --git a/setup.py b/setup.py index 2b7787effc..347edef3b7 100644 --- a/setup.py +++ b/setup.py @@ -245,7 +245,7 @@ def extract_version(): zip_safe=False, setup_requires=pip_requirements('setup'), - install_requires=pip_requirements('core'), + install_requires=pip_requirements('setup') + pip_requirements('core'), tests_require=['{}[test]'.format(pypi_name)], extras_require = { 'test': pip_requirements('test'),