zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-matplotlib: incorporate 8532 w/ version range (#9151)

Browse Source 
* py-matplotlib: Add patch to fix FreeType library detection

Adds patch to add $CPATH to locations searched for FreeType header file

Patch has been upstreamed:
https://github.com/matplotlib/matplotlib/pull/11457

* py-matplotlib: Add patch to fix FreeType library detection

* Make patch only apply to versin 2.2.2 (as already upstreamed)
* Fix flake8 format issue

* py-matplotlib: add range to freetype patch

* py-matplotlib: whitespace
This commit is contained in:
Levi Baber 2018-09-03 20:34:41 -05:00 committed by Adam J. Stewart
parent 801f1a0a7d
commit e3bae8f936
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/py-matplotlib/freetype-include-path.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/setupext.py b/setupext.py
index 6d363012eb4..00ef3fe5a3d 100644
--- a/setupext.py
+++ b/setupext.py
@@ -162,8 +162,10 @@ def get_include_dirs():
"""
include_dirs = [os.path.join(d, 'include') for d in get_base_dirs()]
if sys.platform != 'win32':
- # gcc includes this dir automatically, so also look for headers in
+ # gcc includes these dirs automatically, so also look for headers in
# these dirs
+ include_dirs.extend(
+ os.environ.get('CPATH', '').split(os.pathsep))
include_dirs.extend(
os.environ.get('CPLUS_INCLUDE_PATH', '').split(os.pathsep))
return include_dirs

2
var/spack/repos/builtin/packages/py-matplotlib/package.py
View File

@ -34,6 +34,7 @@ class PyMatplotlib(PythonPackage):
homepage = "https://pypi.python.org/pypi/matplotlib"
url = "https://pypi.io/packages/source/m/matplotlib/matplotlib-2.0.2.tar.gz"
version('2.2.3', '403b0bddd751d71187416f20d4cff100')
version('2.2.2', 'dd1e49e041309a7fd4e32be8bf17c3b6')
version('2.0.2', '061111784278bde89b5d4987014be4ca')
version('2.0.0', '7aa54b06327f0e1c4f3877fc2f7d6b17')
@ -68,6 +69,7 @@ class PyMatplotlib(PythonPackage):
depends_on('libpng@1.2:')
depends_on('freetype@2.3:')
patch('freetype-include-path.patch', when='@2.2.2:2.9.9') # Patch to pick up correct freetype headers
depends_on('py-numpy@1.6:', type=('build', 'run'))
depends_on('py-dateutil@1.1:', type=('build', 'run'))