From aec5874b94468812f009266fafd328cf9dc7e815 Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 30 Nov 2019 20:07:14 +0100 Subject: Mark py-argparse dependency everywhere with ^python@:2.6 (#13928) * Mark py-argparse dependency everywhere with ^python@:2.6 * Update package.py * Update package.py --- var/spack/repos/builtin/packages/awscli/package.py | 2 +- var/spack/repos/builtin/packages/git-imerge/package.py | 2 +- var/spack/repos/builtin/packages/httpie/package.py | 2 +- var/spack/repos/builtin/packages/lbann/package.py | 2 +- var/spack/repos/builtin/packages/nrm/package.py | 2 +- var/spack/repos/builtin/packages/oclint/package.py | 2 +- var/spack/repos/builtin/packages/py-numba/package.py | 2 +- var/spack/repos/builtin/packages/py-opppy/package.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/awscli/package.py b/var/spack/repos/builtin/packages/awscli/package.py index e502184382..3bc5c977f6 100644 --- a/var/spack/repos/builtin/packages/awscli/package.py +++ b/var/spack/repos/builtin/packages/awscli/package.py @@ -24,7 +24,7 @@ class Awscli(PythonPackage): when='^python@2.6:2.6.99') depends_on('py-pyyaml@3.10:5.1', type=('build', 'run'), when='^python@2.7:') - depends_on('py-argparse@1.1:', when='^python@2.6:2.6.99', + depends_on('py-argparse@1.1:', when='^python@:2.6', type=('build', 'run')) depends_on('py-s3transfer@0.2.0:0.2.999', type=('build', 'run')) depends_on('py-botocore@1.12.169', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py index 67ef3ea614..d1999c62e6 100644 --- a/var/spack/repos/builtin/packages/git-imerge/package.py +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -31,7 +31,7 @@ class GitImerge(MakefilePackage): version('1.0.0', sha256='2ef3a49a6d54c4248ef2541efc3c860824fc8295a7226760f24f0bb2c5dd41f2') depends_on('python@2.6:') - depends_on('py-argparse', when='^python@2.6') + depends_on('py-argparse', when='^python@:2.6') depends_on('git') # Package copies a Python script and bash-completion files, so diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index 70fc8d764f..033c7ec4e2 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -26,4 +26,4 @@ class Httpie(PythonPackage): # https://github.com/spack/spack/issues/3628 # depends_on('py-argparse@1.2.1:', type=('build', 'run'), # when='^python@:2.6,3.0:3.1') - depends_on('py-argparse@1.2.1:', type=('build', 'run')) + depends_on('py-argparse@1.2.1:', type=('build', 'run'), when='^python@:2.6') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 79fd5f0035..366e02fa7e 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -104,7 +104,7 @@ class Lbann(CMakePackage): depends_on('python@3: +shared', type=('build', 'run'), when='@:0.90,0.99:') extends("python") depends_on('py-setuptools', type='build') - depends_on('py-argparse', type='run', when='@:0.90,0.99:') + depends_on('py-argparse', type='run', when='@:0.90,0.99: ^python@:2.6') depends_on('py-configparser', type='run', when='@:0.90,0.99:') depends_on('py-graphviz@0.10.1:', type='run', when='@:0.90,0.99:') depends_on('py-matplotlib@3.0.0:', type='run', when='@:0.90,0.99:') diff --git a/var/spack/repos/builtin/packages/nrm/package.py b/var/spack/repos/builtin/packages/nrm/package.py index fa0b88201e..342d57faee 100644 --- a/var/spack/repos/builtin/packages/nrm/package.py +++ b/var/spack/repos/builtin/packages/nrm/package.py @@ -20,7 +20,7 @@ class Nrm(PythonPackage): depends_on('py-pyyaml', type=('build', 'run')) depends_on('py-tornado@5.1.1', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) - depends_on('py-argparse@1.2.1:', type=('build', 'run')) + depends_on('py-argparse@1.2.1:', type=('build', 'run'), when='^python@:2.6') depends_on('py-jsonschema@2.6.0', type=('build', 'run')) depends_on('py-warlock', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py index 645e7090d4..215599ff11 100644 --- a/var/spack/repos/builtin/packages/oclint/package.py +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -19,7 +19,7 @@ class Oclint(Package): version('0.13', sha256='a0fd188673863e6357d6585b9bb9c3affe737df134b9383a1a5ed021d09ed848') depends_on('python', type=('build')) - depends_on('py-argparse', type=('build')) + depends_on('py-argparse', type=('build'), when='^python@:2.6') depends_on('git', type=('build')) depends_on('subversion', type=('build')) depends_on('cmake', type=('build')) diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index efad3b2a17..629c7c63e9 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -27,7 +27,7 @@ class PyNumba(PythonPackage): depends_on('py-llvmlite@0.25:', type=('build', 'run'), when='@0.40.1:') depends_on('py-llvmlite@0.20:0.25', type=('build', 'run'), when='@0.35.1') - depends_on('py-argparse', type=('build', 'run')) + depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6') depends_on('py-funcsigs', type=('build', 'run'), when='^python@:3.3.99') depends_on('py-singledispatch', type=('build', 'run'), when='^python@:3.3.99') diff --git a/var/spack/repos/builtin/packages/py-opppy/package.py b/var/spack/repos/builtin/packages/py-opppy/package.py index b6edea8226..616629eb6a 100644 --- a/var/spack/repos/builtin/packages/py-opppy/package.py +++ b/var/spack/repos/builtin/packages/py-opppy/package.py @@ -21,7 +21,7 @@ class PyOpppy(PythonPackage): depends_on('py-setuptools', type=('build', 'run')) depends_on('py-numpy@1.6:', type=('build', 'run')) depends_on('python@3:', type=('build', 'run')) - depends_on('py-argparse', type=('build', 'run')) + depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6') depends_on('py-scipy', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) depends_on('py-sphinx', type=('build', 'run')) -- cgit v1.2.3-60-g2f50