Skip to content
Snippets Groups Projects
Commit 4e17ae91 authored by Adam J. Stewart's avatar Adam J. Stewart Committed by GitHub
Browse files

Hack to fix python dependency ranges (#3938)

* Hack to fix python dependency ranges

* Flake8
parent fc8106af
No related branches found
No related tags found
No related merge requests found
Showing
with 24 additions and 24 deletions
......@@ -46,7 +46,7 @@ class Cmor(AutotoolsPackage):
depends_on('hdf5@:1.8')
extends('python', when='+python')
depends_on('python@:2.7', when='+python')
depends_on('python@:2.8', when='+python')
depends_on('py-numpy', type=('build', 'run'), when='+python')
@run_before('configure')
......
......@@ -56,7 +56,7 @@ def url_for_version(self, version):
depends_on('mpi', when='+mpi')
depends_on('planck-likelihood', when='+planck')
depends_on('python @2.7:2.999,3.4:')
depends_on('python@2.7:2.8,3.4:')
parallel = False
......
......@@ -48,7 +48,7 @@ class Espressopp(CMakePackage):
depends_on("mpi")
depends_on("boost+serialization+filesystem+system+python+mpi", when='@1.9.4:')
extends("python")
depends_on("python@2:2.7.13")
depends_on("python@2:2.8")
depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run'))
depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type=('build', 'run'))
depends_on("fftw")
......
......@@ -75,7 +75,7 @@ class Julia(Package):
depends_on("git", when='@:0.4')
depends_on("git", when='@release-0.4')
depends_on("openssl")
depends_on("python @2.7:2.999")
depends_on("python@2.7:2.8")
# Run-time dependencies:
# depends_on("arpack")
......
......@@ -47,7 +47,7 @@ class NodeJs(Package):
depends_on('libtool', type='build', when=sys.platform != 'darwin')
depends_on('pkg-config', type='build')
depends_on('python@2.7:2.7.999', type='build')
depends_on('python@2.7:2.8', type='build')
# depends_on('bash-completion', when="+bash-completion")
depends_on('icu4c', when='+icu4c')
depends_on('openssl', when='+openssl')
......@@ -63,10 +63,10 @@ def install(self, spec, prefix):
# On OSX, the system libtool must be used
# So, we ensure that this is the case by...
if sys.platform == 'darwin':
process_pipe = subprocess.Popen(["which", "libtool"],
process_pipe = subprocess.Popen(["which", "libtool"],
stdout=subprocess.PIPE)
result_which = process_pipe.communicate()[0]
process_pipe = subprocess.Popen(["whereis", "libtool"],
process_pipe = subprocess.Popen(["whereis", "libtool"],
stdout=subprocess.PIPE)
result_whereis = process_pipe.communicate()[0]
assert result_which == result_whereis, (
......
......@@ -47,7 +47,7 @@ class Paraview(CMakePackage):
variant('qt', default=False, description='Enable Qt (gui) support')
variant('opengl2', default=True, description='Enable OpenGL2 backend')
depends_on('python@2:2.7', when='+python')
depends_on('python@2:2.8', when='+python')
depends_on('py-numpy', when='+python', type='run')
depends_on('py-matplotlib', when='+python', type='run')
depends_on('mpi', when='+mpi')
......
......@@ -92,7 +92,7 @@ class Petsc(Package):
depends_on('mpi', when='+mpi')
# Build dependencies
depends_on('python @2.6:2.7', type='build')
depends_on('python@2.6:2.8', type='build')
# Other dependencies
depends_on('boost', when='@:3.5+boost')
......
......@@ -36,7 +36,7 @@ class PyAutopep8(PythonPackage):
version('1.2.2', '3d97f9c89d14a0975bffd32a2c61c36c')
extends('python', ignore='bin/pep8')
depends_on('python@2.6:2.7,3.2:')
depends_on('python@2.6:2.8,3.2:')
depends_on('py-pycodestyle@1.5.7:1.7.0', type=('build', 'run'))
......
......@@ -37,4 +37,4 @@ class PyBackportsShutilGetTerminalSize(PythonPackage):
# newer setuptools version mess with "namespace" packages in an
# incompatible way cf. https://github.com/pypa/setuptools/issues/900
depends_on('py-setuptools@:30.999.999', type='build')
depends_on('python@:3.2.999')
depends_on('python@:3.2')
......@@ -33,7 +33,7 @@ class PyBleach(PythonPackage):
version('1.5.0', 'b663300efdf421b3b727b19d7be9c7e7')
depends_on('python@2.6:2.7,3.2:3.5')
depends_on('python@2.6:2.8,3.2:3.5')
depends_on('py-setuptools', type='build')
depends_on('py-six', type=('build', 'run'))
depends_on('py-html5lib@0.999,0.999999:0.9999999', type=('build', 'run'))
......@@ -35,7 +35,7 @@ class PyConfigparser(PythonPackage):
version('3.5.0', 'cfdd915a5b7a6c09917a64a573140538',
url="https://pypi.python.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz")
depends_on('python@2.6:2.7,3.4:')
depends_on('python@2.6:2.8,3.4:')
# This dependency breaks concretization
# See https://github.com/LLNL/spack/issues/2793
......
......@@ -39,6 +39,6 @@ class PyDill(PythonPackage):
version('0.2.1', 'b2354a5717da6228acae33cb13bc407b')
version('0.2', '759002d9b71605cde2a7a052dad96b5d')
depends_on('python@2.5:2.999,3.1:')
depends_on('python@2.5:2.8,3.1:')
depends_on('py-setuptools@0.6:', type='build')
......@@ -33,7 +33,7 @@ class PyEasybuildFramework(PythonPackage):
version('3.1.2', '283bc5f6bdcb90016b32986d52fd04a8')
depends_on('python@2.6:2.9', type='run')
depends_on('python@2.6:2.8', type='run')
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-vsc-base@2.5.4:', when='@2.9:', type='run')
depends_on('py-vsc-install', type='run') # only required for tests (python -O -m test.framework.suite)
......@@ -37,5 +37,5 @@ class PyEnum34(PythonPackage):
# This dependency breaks concretization
# See https://github.com/LLNL/spack/issues/2793
# depends_on('py-ordereddict', when='^python@:2.6.999', type=('build', 'run')) # noqa
# depends_on('py-ordereddict', when='^python@:2.6', type=('build', 'run'))
depends_on('py-setuptools', type='build')
......@@ -59,8 +59,8 @@ class PyFlake8(PythonPackage):
# These dependencies breaks concretization
# See https://github.com/LLNL/spack/issues/2793
# depends_on('py-configparser', when='^python@:3.3.999', type=('build', 'run')) # noqa
# depends_on('py-enum34', when='^python@:3.1.999', type=('build', 'run'))
# depends_on('py-configparser', when='^python@:3.3', type=('build', 'run'))
# depends_on('py-enum34', when='^python@:3.1', type=('build', 'run'))
depends_on('py-configparser', type=('build', 'run'))
depends_on('py-enum34', type=('build', 'run'))
......
......@@ -33,5 +33,5 @@ class PyHtml5lib(PythonPackage):
version('0.9999999', 'ef43cb05e9e799f25d65d1135838a96f')
depends_on('python@2.6:2.7,3.2:3.4')
depends_on('python@2.6:2.8,3.2:3.4')
depends_on('py-six', type=('build', 'run'))
......@@ -39,7 +39,7 @@ class PyIpdb(PythonPackage):
# this the original packager does not know what they are. See the 3rd party
# section on ipdb's GitHub:
# https://github.com/gotcha/ipdb#third-party-support
depends_on('python@2.6:2.7,3.2:')
depends_on('python@2.6:2.8,3.2:')
# Dependencies gathered from:
# https://github.com/gotcha/ipdb/blob/master/setup.py
......
......@@ -42,7 +42,7 @@ class PyIpykernel(PythonPackage):
version('4.1.1', '51376850c46fb006e1f8d1cd353507c5')
version('4.1.0', '638a43e4f8a15872f749090c3f0827b6')
depends_on('python@2.7:2.7.999,3.3:')
depends_on('python@2.7:2.8,3.3:')
depends_on('py-traitlets@4.1.0:', type=('build', 'run'))
depends_on('py-tornado@4.0:', type=('build', 'run'))
depends_on('py-ipython@4.0:', type=('build', 'run'))
......
......@@ -33,4 +33,4 @@ class PyIpythonGenutils(PythonPackage):
version('0.1.0', '9a8afbe0978adbcbfcb3b35b2d015a56')
depends_on('python@2.7:2.7.999,3.3:')
depends_on('python@2.7:2.8,3.3:')
......@@ -41,8 +41,8 @@ class PyIpython(PythonPackage):
# These dependencies breaks concretization
# See https://github.com/LLNL/spack/issues/2793
# depends_on('py-backports-shutil-get-terminal-size', type=('build', 'run'), when="^python@:3.2.999") # noqa
# depends_on('py-pathlib2', type=('build', 'run'), when="^python@:3.3.999")
# depends_on('py-backports-shutil-get-terminal-size', type=('build', 'run'), when="^python@:3.2") # noqa
# depends_on('py-pathlib2', type=('build', 'run'), when="^python@:3.3")
depends_on('py-backports-shutil-get-terminal-size', type=('build', 'run'))
depends_on('py-pathlib2', type=('build', 'run'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment