From fbc16880eaf9b87ac9c88ff8e86158598001da5c Mon Sep 17 00:00:00 2001
From: Oliver Beckstein <orbeckst@gmail.com>
Date: Thu, 15 Jun 2017 17:18:13 -0700
Subject: [PATCH] make scipy and matplotlib full dependencies (#1159)

---
 .travis.yml       | 7 +++----
 package/CHANGELOG | 3 +++
 package/setup.py  | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 18fcfc5a74e..647af4d97f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,9 @@ env:
     - MAIN_CMD="python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST1} ${NOSE_FLAGS}; python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST2} ${NOSE_FLAGS}"
     - SETUP_CMD=""
     - BUILD_CMD="pip install -v package/ && pip install testsuite/"
-    - CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer"
-    - CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy seaborn coveralls clustalw=2.1"
-    # Install griddataformats from PIP so that scipy is only installed in the full build (#1147)
-    - PIP_DEPENDENCIES='griddataformats'
+    - CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib scipy griddataformats"
+    - CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy griddataformats seaborn coveralls clustalw=2.1"
+    - PIP_DEPENDENCIES=""
     - CONDA_CHANNELS='biobuilds conda-forge'
     - CONDA_CHANNEL_PRIORITY=True
     - NUMPY_VERSION=stable
diff --git a/package/CHANGELOG b/package/CHANGELOG
index f1aba435b37..6859b765b25 100644
--- a/package/CHANGELOG
+++ b/package/CHANGELOG
@@ -29,6 +29,9 @@ Fixes
   * Fixed dtype of numpy arrays to accomodate 32 bit architectures (Issue #1362)
   * Groups are hashable on python 3 (Issue #1397)
 
+Changes
+  * scipy and matplotlib are now required dependencies (Issue #1159)
+
 
 06/03/17 utkbansal, kain88-de, xiki-tempula, kaplajon, wouterboomsma,
          richardjgowers, Shtkddud123, QuantumEntangledAndy, orbeckst,
diff --git a/package/setup.py b/package/setup.py
index 5aecb4889c5..04b7fb23e1e 100755
--- a/package/setup.py
+++ b/package/setup.py
@@ -494,11 +494,12 @@ def dynamic_author_list():
           classifiers=CLASSIFIERS,
           cmdclass=cmdclass,
           requires=['numpy (>=1.10.4)', 'biopython', 'mmtf (>=1.0.0)',
-                    'networkx (>=1.0)', 'GridDataFormats (>=0.3.2)', 'joblib'],
+                    'networkx (>=1.0)', 'GridDataFormats (>=0.3.2)', 'joblib',
+                    'scipy', 'matplotlib (>=1.5.1)'],
           # all standard requirements are available through PyPi and
           # typically can be installed without difficulties through setuptools
           setup_requires=[
-              'numpy>=1.9.3',
+              'numpy>=1.10.4',
           ],
           install_requires=[
               'numpy>=1.10.4',
@@ -508,6 +509,8 @@ def dynamic_author_list():
               'six>=1.4.0',
               'mmtf-python>=1.0.0',
               'joblib',
+              'scipy',
+              'matplotlib>=1.5.1',
           ],
           # extras can be difficult to install through setuptools and/or
           # you might prefer to use the version available through your
@@ -516,8 +519,6 @@ def dynamic_author_list():
               'AMBER': ['netCDF4>=1.0'],  # for AMBER netcdf, also needs HDF5
                                           # and netcdf-4
               'analysis': [
-                  'matplotlib>=1.5.1',
-                  'scipy',
                   'seaborn',  # for annotated heat map and nearest neighbor
                               # plotting in PSA
                   'sklearn',  # For clustering and dimensionality reduction