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

py-argparse: skip dep for newer Python (#28718)

Browse Source
This commit is contained in:
Adam J. Stewart 2022-02-01 16:38:11 -06:00 committed by GitHub
parent 50c6075509
commit 7144af9c3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ class Awscli(PythonPackage):
depends_on('py-docutils@0.10:0.15', type=('build', 'run'))
depends_on('py-rsa@3.1.2:3.5.0', type=('build', 'run'))
depends_on('py-s3transfer@0.2.0:0.2', type=('build', 'run'))
depends_on('py-argparse@1.1:', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse@1.1:', when='^python@:2.6,3.0:3.1', type=('build', 'run'))
depends_on('py-pyyaml@3.10:3.13', when='^python@:2.6,3.0:3.3', type=('build', 'run'))
depends_on('py-pyyaml@3.10:5.2', when='^python@3.4:', type=('build', 'run'))
depends_on('py-colorama@0.2.5:0.3.9', when='^python@:2.6,3.0:3.3', type=('build', 'run'))

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

@ -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,3.0:3.1')
depends_on('git')
# Package copies a Python script and bash-completion files, so

6
var/spack/repos/builtin/packages/httpie/package.py
View File

@ -27,8 +27,4 @@ class Httpie(PythonPackage):
depends_on('py-requests@2.11:', type=('build', 'run'))
depends_on('py-requests@2.22:+socks', when='@2.5:', type=('build', 'run'))
depends_on('py-requests-toolbelt@0.9.1:', when='@2.5:', type=('build', 'run'))
# Concretization problem breaks this. Unconditional for now...
# 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'), when='^python@:2.6')
depends_on('py-argparse@1.2.1:', type=('build', 'run'), when='^python@:2.6,3.0:3.1')

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

@ -20,7 +20,7 @@ class Isescan(Package):
depends_on('py-scipy@0.13.1:', type='run')
depends_on('py-biopython@1.62:', type='run')
depends_on('py-fastcluster', type='run')
depends_on('py-argparse', type='run')
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type='run')
depends_on('blast-plus@2.2.31:', type='run')
depends_on('fraggenescan@:1.30', type='run')
depends_on('hmmer@3.1b2:', type='run')

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

@ -214,7 +214,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage):
depends_on('python@3: +shared', type=('build', 'run'), when='@:0.90,0.99: +pfe')
extends("python", when='+pfe')
depends_on('py-setuptools', type='build', when='+pfe')
depends_on('py-argparse', type='run', when='@:0.90,0.99: +pfe ^python@:2.6')
depends_on('py-argparse', type='run', when='@:0.90,0.99: +pfe ^python@:2.6,3.0:3.1')
depends_on('py-configparser', type='run', when='@:0.90,0.99: +pfe +extras')
depends_on('py-graphviz@0.10.1:', type='run', when='@:0.90,0.99: +pfe +extras')
depends_on('py-matplotlib@3.0.0:', type='run', when='@:0.90,0.99: +pfe +extras')

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

@ -28,7 +28,7 @@ class MlperfDeepcam(Package, CudaPackage):
depends_on('py-pillow', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-pillow', type=('build', 'run'))
depends_on('py-argparse', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))
depends_on('py-pandas', type=('build', 'run'))
depends_on('py-apex', type=('build', 'run'))
depends_on('py-wandb', type=('build', 'run'))

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

@ -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'), when='^python@:2.6')
depends_on('py-argparse@1.2.1:', type=('build', 'run'), when='^python@:2.6,3.0:3.1')
depends_on('py-jsonschema@2.6.0', type=('build', 'run'))
depends_on('py-warlock', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))

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

@ -19,7 +19,7 @@ class Oclint(Package):
version('0.13', sha256='a0fd188673863e6357d6585b9bb9c3affe737df134b9383a1a5ed021d09ed848')
depends_on('python', type=('build'))
depends_on('py-argparse', type=('build'), when='^python@:2.6')
depends_on('py-argparse', type=('build'), when='^python@:2.6,3.0:3.1')
depends_on('git', type=('build'))
depends_on('subversion', type=('build'))
depends_on('cmake', type=('build'))

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

@ -23,4 +23,4 @@ class PyArgh(PythonPackage):
version('0.26.2', sha256='e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65')
depends_on('py-setuptools', type='build')
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -16,4 +16,4 @@ class PyCatkinPkg(PythonPackage):
depends_on('py-docutils', type=('build', 'run'))
depends_on('py-python-dateutil', type=('build', 'run'))
depends_on('py-pyparsing', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -17,4 +17,4 @@ class PyCodecov(PythonPackage):
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-requests@2.7.9:', type=('build', 'run'))
depends_on('py-coverage', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -18,7 +18,7 @@ class PyCsvkit(PythonPackage):
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-six@1.6.1:', type=('build', 'run'))
depends_on('py-argparse@1.2.1:', type=('build', 'run'), when='^python@:2.6')
depends_on('py-argparse@1.2.1:', type=('build', 'run'), when='^python@:2.6,3.0:3.1')
depends_on('py-ordereddict@1.1:', type=('build', 'run'), when='^python@:2.6')
depends_on('py-simplejson@3.6.3:', type=('build', 'run'), when='^python@:2.6')
depends_on('py-python-dateutil@2.2', type=('build', 'run'), when='@0.9.1')

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

@ -35,6 +35,6 @@ class PyFiona(PythonPackage):
depends_on('py-six@1.7:', type=('build', 'run'))
depends_on('py-munch', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6')
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6,3.0:3.1')
depends_on('py-ordereddict', type=('build', 'run'), when='^python@:2.6')
depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3')

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

@ -20,7 +20,7 @@ class PyFuture(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-importlib', type=('build', 'run'), when='^python@:2.6')
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6')
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6,3.0:3.1')
@property
def import_modules(self):

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

@ -17,5 +17,5 @@ class PyMemprof(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-cython', type='build')
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))

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

@ -39,7 +39,7 @@ class PyNumba(PythonPackage):
depends_on('py-llvmlite@0.25.0:', 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'), when='^python@:2.6')
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6,3.0:3.1')
depends_on('py-funcsigs', type=('build', 'run'), when='@:0.47 ^python@:3.2')
depends_on('py-enum34', type=('build', 'run'), when='@:0.47 ^python@:3.3')
depends_on('py-singledispatch', type=('build', 'run'), when='@:0.47 ^python@:3.3')

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

@ -21,7 +21,7 @@ class PyOpentuner(PythonPackage):
depends_on('python@3:', type=('build', 'run'), when='@0.8.1:')
depends_on('python@2.7:2.8', type=('build', 'run'), when='@:0.8.0')
depends_on('py-argparse@1.2.1:', type=('build', 'run'))
depends_on('py-argparse@1.2.1:', when='^python@:2.6,3.0:3.1', type=('build', 'run'))
depends_on('py-fn-py@0.2.12:', type=('build', 'run'))
depends_on('py-future', type=('build', 'run'))
depends_on('py-numpy@1.8.0:', type=('build', 'run'))

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

@ -17,4 +17,4 @@ class PyPlac(PythonPackage):
version('1.1.3', sha256='398cb947c60c4c25e275e1f1dadf027e7096858fb260b8ece3b33bcff90d985f')
depends_on('py-setuptools', type='build')
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -16,4 +16,4 @@ class PyPyfaidx(PythonPackage):
depends_on('py-setuptools@0.7:', type=('build', 'run'))
depends_on('py-six', type=('build', 'run'))
depends_on('py-ordereddict', type=('build', 'run'), when='^python@:2.6')
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6')
depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6,3.0:3.1')

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

@ -16,7 +16,7 @@ class PyPyvcf(PythonPackage):
version('0.6.0', sha256='d9ec3bbedb64fa35c2648a9c41fdefaedd3912ff597a436e073d27aeccf5de7c')
depends_on('py-setuptools', type='build')
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))
depends_on('py-counter', when='^python@:2.6', type=('build', 'run'))
depends_on('py-ordereddict', when='^python@:2.6', type=('build', 'run'))
depends_on('py-unittest2', when='^python@:2.6', type=('build', 'run'))

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

@ -14,6 +14,6 @@ class PyRosdistro(PythonPackage):
depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))
depends_on('py-catkin-pkg', type=('build', 'run'))
depends_on('py-rospkg', type=('build', 'run'))

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

@ -16,4 +16,4 @@ class PyRospkg(PythonPackage):
depends_on('py-catkin-pkg', type=('build', 'run'))
depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-distro', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -20,4 +20,4 @@ class PyScoop(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-greenlet@0.3.4:', type=('build', 'run'))
depends_on('py-pyzmq@13.1.0:', type=('build', 'run'))
depends_on('py-argparse@1.1:', type=('build', 'run'))
depends_on('py-argparse@1.1:', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -17,4 +17,4 @@ class PyUnittest2(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-traceback2', type=('build', 'run'))
depends_on('py-six@1.4:', type=('build', 'run'))
depends_on('py-argparse', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -16,4 +16,4 @@ class PyVcstool(PythonPackage):
depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))

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

@ -23,4 +23,4 @@ class PyWebsocketClient(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-six', type=('build', 'run'), when='@:1.2.0')
depends_on('py-backports-ssl-match-hostname', when='^python@2.6:2.7.9', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
depends_on('py-argparse', when='^python@:2.6,3.0:3.1', type=('build', 'run'))