Merge pull request #219 from bashtage/optional-mpl

Optional mpl
bashtage · Aug 14, 2018 · 6181efe · 6181efe
2 parents bfe7669 + 5f6cbce
commit 6181efe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,7 @@ matrix:
     env:
     - PYTHON=3.5
     - COVERAGE=true
+    - MATPLOTLIB=1.5
   - python: 2.7
     env:
     - PYTHON=3.6
@@ -47,9 +48,11 @@ matrix:
     env:
     - PYTHON=3.6
     - DOCBUILD=true
+    - MATPLOTLIB=2
   - python: 2.7
     env:
     - PYTHON=3.7
+    - MATPLOTLIB=2
     - COVERAGE=true
 
 before_install:
@@ -73,7 +76,7 @@ before_install:
   - PKGS="${PKGS} patsy"; if [[ ${PATSY} ]]; then PKGS="${PKGS}=${PATSY}"; fi;
   - PKGS="${PKGS} pandas"; if [[ ${PANDAS} ]]; then PKGS="${PKGS}=${PANDAS}"; fi;
   - PKGS="${PKGS} Cython"; if [[ ${CYTHON} ]]; then PKGS="${PKGS}=${CYTHON}"; fi;
-  - PKGS="${PKGS} matplotlib"; if [[ ${MATPLOTLIB} ]]; then PKGS="${PKGS}=${MATPLOTLIB}"; fi;
+  - if [[ ${MATPLOTLIB} ]]; then PKGS="${PKGS} matplotlib=${MATPLOTLIB}"; fi;
   - PKGS="${PKGS} statsmodels"; if [[ ${STATSMODELS} ]]; then PKGS="${PKGS}=${STATSMODELS}"; fi;
   - if [[ ${USE_NUMBA} = true ]]; then PKGS="${PKGS} numba"; if [[ ${NUMBA} ]]; then PKGS="${PKGS}=${NUMBA}";  fi; fi;
   - conda create --yes --quiet -n arch-test ${PKGS} ${OPTIONAL} statsmodels

diff --git a/setup.py b/setup.py
@@ -63,15 +63,11 @@ def build_extensions(self):
         _build_ext.build_extensions(self)
 
 
-SETUP_REQUIREMENTS = {'numpy': '1.12'}
-REQUIREMENTS = {'Cython': '0.24',
-                'matplotlib': '1.5',
-                'scipy': '0.19',
-                'pandas': '0.20',
-                'statsmodels': '0.8'}
-
-ALL_REQUIREMENTS = SETUP_REQUIREMENTS.copy()
-ALL_REQUIREMENTS.update(REQUIREMENTS)
+SETUP_REQUIREMENTS = {'numpy': '1.12', 'Cython': '0.24'}
+INSTALL_REQUIREMENTS = SETUP_REQUIREMENTS.copy()
+INSTALL_REQUIREMENTS.update({'scipy': '0.19',
+                             'pandas': '0.20',
+                             'statsmodels': '0.8'})
 
 cmdclass['build_ext'] = build_ext
 
@@ -170,8 +166,8 @@ def run_setup(binary=True):
               'Programming Language :: Cython',
               'Topic :: Scientific/Engineering',
           ],
-          install_requires=[key + '>=' + REQUIREMENTS[key]
-                            for key in REQUIREMENTS],
+          install_requires=[key + '>=' + INSTALL_REQUIREMENTS[key]
+                            for key in INSTALL_REQUIREMENTS],
           setup_requires=[key + '>=' + SETUP_REQUIREMENTS[key]
                           for key in SETUP_REQUIREMENTS],
           )