From 8eae47ab442ba2f0e3750ed18780d4f33f2067e0 Mon Sep 17 00:00:00 2001 From: Eric Firing Date: Thu, 17 Nov 2016 19:36:09 -1000 Subject: [PATCH 1/2] Bump minimum numpy version to 1.7.1. This matches the version required by SciPy 0.18.0, and provided by RHEL 7. --- lib/matplotlib/__init__.py | 2 +- setupext.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 0e4450ad1f2c..7c792bd0c160 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -135,7 +135,7 @@ __version__ = str(get_versions()['version']) del get_versions -__version__numpy__ = str('1.6') # minimum required numpy version +__version__numpy__ = str('1.7.1') # minimum required numpy version __bibtex__ = """@Article{Hunter:2007, Author = {Hunter, J. D.}, diff --git a/setupext.py b/setupext.py index 9f5e500fa875..f77e24555d40 100644 --- a/setupext.py +++ b/setupext.py @@ -898,10 +898,10 @@ def add_flags(self, ext): 'NPY_1_7_API_VERSION')) def get_setup_requires(self): - return ['numpy>=1.6'] + return ['numpy>=1.7.1'] def get_install_requires(self): - return ['numpy>=1.6'] + return ['numpy>=1.7.1'] class LibAgg(SetupPackage): From 2267eaa6cf9ff74bd02006bae85006963534cac9 Mon Sep 17 00:00:00 2001 From: Eric Firing Date: Thu, 17 Nov 2016 19:50:19 -1000 Subject: [PATCH 2/2] change numpy version in .travis.yml for python 2.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 696744ab59dc..0354378dfc7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ language: python matrix: include: - python: 2.7 - env: MOCK=mock NUMPY=numpy==1.6 + env: MOCK=mock NUMPY=numpy==1.7.1 - python: 3.4 - python: 3.5 env: PANDAS=pandas DELETE_FONT_CACHE=1