diff options
| author | haralmha <47558670+haralmha@users.noreply.github.com> | 2021-12-17 15:08:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 08:08:01 -0600 |
| commit | e1f6a2e6b5754b09f96fc0a26a32605c3fb2921a (patch) | |
| tree | 084dbc64ff6330852a94ca9d48399fa30f391b87 | |
| parent | 956bb91cfe8eaca0205dd016e1753bdf5d59a72c (diff) | |
| download | spack-e1f6a2e6b5754b09f96fc0a26a32605c3fb2921a.tar.gz spack-e1f6a2e6b5754b09f96fc0a26a32605c3fb2921a.tar.bz2 spack-e1f6a2e6b5754b09f96fc0a26a32605c3fb2921a.tar.xz spack-e1f6a2e6b5754b09f96fc0a26a32605c3fb2921a.zip | |
Specify dependencies to py-setuptools@:57.99 for packages using 2to3 (#27777)
| -rw-r--r-- | var/spack/repos/builtin/packages/gdal/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-genshi/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-nose/package.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index fac08d8f69..bea77acf20 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -155,7 +155,8 @@ class Gdal(AutotoolsPackage): depends_on('python@2.0:', type=('build', 'link', 'run'), when='@3.2:+python') depends_on('python', type=('build', 'link', 'run'), when='+python') # swig/python/setup.py - depends_on('py-setuptools', type='build', when='+python') + depends_on('py-setuptools@:57', type='build', when='@:3.0+python') + depends_on('py-setuptools', type='build', when='@3.1:+python') depends_on('py-numpy@1.0.0:', type=('build', 'run'), when='+python') depends_on('java@7:', type=('build', 'link', 'run'), when='@3.2:+java') depends_on('java@6:', type=('build', 'link', 'run'), when='@2.4:+java') diff --git a/var/spack/repos/builtin/packages/py-genshi/package.py b/var/spack/repos/builtin/packages/py-genshi/package.py index 30d2efa821..1fdf64bb51 100644 --- a/var/spack/repos/builtin/packages/py-genshi/package.py +++ b/var/spack/repos/builtin/packages/py-genshi/package.py @@ -15,4 +15,4 @@ class PyGenshi(PythonPackage): version('0.6.1', sha256='fed947f11dbcb6792bb7161701ec3b9804055ad68c8af0ab4f0f9b25e9a18dbd') version('0.6', sha256='32aaf76a03f88efa04143bf80700399e6d84eead818fdd19d763fd76af972a4b') - depends_on("py-setuptools", type='build') + depends_on("py-setuptools@:57", type='build') diff --git a/var/spack/repos/builtin/packages/py-nose/package.py b/var/spack/repos/builtin/packages/py-nose/package.py index 542931d39c..9a50b115f1 100644 --- a/var/spack/repos/builtin/packages/py-nose/package.py +++ b/var/spack/repos/builtin/packages/py-nose/package.py @@ -16,4 +16,4 @@ class PyNose(PythonPackage): version('1.3.6', sha256='f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758') version('1.3.4', sha256='76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools@:57', type='build') |