From 4a1df7e0b22409d0cf9265fbc7952adb442212e2 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 14 Sep 2016 10:56:08 -0400 Subject: [PATCH 1/3] Resolved issues of py-pillow, py-scipy and binutils dependencies. Resolves #1506 py-pillow: Remove version dependency on binutils@2.25. In tests, it works just fine with binutils@2.26. Fixed flake8 issues. --- var/spack/repos/builtin/packages/binutils/package.py | 3 +-- var/spack/repos/builtin/packages/py-pillow/package.py | 6 ++++-- var/spack/repos/builtin/packages/py-scipy/package.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index e329e6fd7a..af4d87d5c2 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -31,9 +31,8 @@ class Binutils(Package): homepage = "http://www.gnu.org/software/binutils/" url = "https://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2" - # 2.26 is incompatible with py-pillow build for some reason. version('2.26', '64146a0faa3b411ba774f47d41de239f') - version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66', preferred=True) + version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66') version('2.24', 'e0f71a7b2ddab0f8612336ac81d9636b') version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764') diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 1d8b3faa6f..41b52de216 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -32,7 +32,8 @@ class PyPillow(Package): capabilities.""" homepage = "https://python-pillow.org/" - url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz" + url = "https://pypi.python.org/packages/source" + \ + "/P/Pillow/Pillow-3.0.0.tar.gz" # TODO: This version should be deleted once the next release comes out. # TODO: It fixes a bug that prevented us from linking to Tk/Tcl. @@ -65,7 +66,8 @@ class PyPillow(Package): # Required dependencies extends('python') - depends_on('binutils', type='build') + # Known not to work with 2.23, 2.25 + depends_on('binutils@2.26:', type='build') depends_on('py-setuptools', type='build') # Recommended dependencies diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index cab516e1df..58e08888ff 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -28,7 +28,7 @@ class PyScipy(Package): """Scientific Library for Python.""" homepage = "http://www.scipy.org/" - url = "https://pypi.python.org/packages/source/s/scipy/scipy-0.15.0.tar.gz" + url = "https://pypi.python.org/packages/source/s/scipy/scipy-0.15.0.tar.gz" version('0.17.0', '5ff2971e1ce90e762c59d2cd84837224') version('0.15.1', 'be56cd8e60591d6332aac792a5880110') @@ -36,6 +36,7 @@ class PyScipy(Package): extends('python') depends_on('py-nose', type='build') + depends_on('binutils@2.26:', type='build') depends_on('py-numpy+blas+lapack', type=nolink) def install(self, spec, prefix): From 595ec7e0345c3b1831efbcd39f8b254e3a5fe396 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 14 Sep 2016 16:50:17 -0400 Subject: [PATCH 2/3] Bug fix capturing which packages work with which binutils. --- var/spack/repos/builtin/packages/py-pillow/package.py | 3 +-- var/spack/repos/builtin/packages/py-scipy/package.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 41b52de216..c8e5a96f67 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -66,8 +66,7 @@ class PyPillow(Package): # Required dependencies extends('python') - # Known not to work with 2.23, 2.25 - depends_on('binutils@2.26:', type='build') + depends_on('binutils', type='build') depends_on('py-setuptools', type='build') # Recommended dependencies diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 58e08888ff..83a69c5682 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -36,6 +36,7 @@ class PyScipy(Package): extends('python') depends_on('py-nose', type='build') + # Known not to work with 2.23, 2.25 depends_on('binutils@2.26:', type='build') depends_on('py-numpy+blas+lapack', type=nolink) From a954d0976af30df460689fa817599f6c221b252a Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 14 Sep 2016 16:52:33 -0400 Subject: [PATCH 3/3] Put back full-length URL. --- var/spack/repos/builtin/packages/py-pillow/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index c8e5a96f67..211e3b4199 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -32,8 +32,7 @@ class PyPillow(Package): capabilities.""" homepage = "https://python-pillow.org/" - url = "https://pypi.python.org/packages/source" + \ - "/P/Pillow/Pillow-3.0.0.tar.gz" + url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz" # TODO: This version should be deleted once the next release comes out. # TODO: It fixes a bug that prevented us from linking to Tk/Tcl.