diff options
| author | Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> | 2021-10-08 22:56:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 15:56:22 -0500 |
| commit | 654268b06519d4ca9bf1d63931463638b1d4b4b4 (patch) | |
| tree | 51eb9759d9740ed30a4894b684066a5321b5edff | |
| parent | 6d0d8d021ad54ac7ebac2535dbde7b6a09db0048 (diff) | |
| download | spack-654268b06519d4ca9bf1d63931463638b1d4b4b4.tar.gz spack-654268b06519d4ca9bf1d63931463638b1d4b4b4.tar.bz2 spack-654268b06519d4ca9bf1d63931463638b1d4b4b4.tar.xz spack-654268b06519d4ca9bf1d63931463638b1d4b4b4.zip | |
py-bcrypt, py-bleach, py-decorator, py-pygdal: fix python dependency (#26596)
* py-bcrypt, py-bleach, py-decorator, py-pygdal: fix python dependency
* Update var/spack/repos/builtin/packages/py-bleach/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
4 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-bcrypt/package.py b/var/spack/repos/builtin/packages/py-bcrypt/package.py index 9eaea58ae2..fcc0464776 100644 --- a/var/spack/repos/builtin/packages/py-bcrypt/package.py +++ b/var/spack/repos/builtin/packages/py-bcrypt/package.py @@ -17,6 +17,9 @@ class PyBcrypt(PythonPackage): version('3.1.6', sha256='169d3e6edbf8717e8856748b72fb02abe8ce8e0b65d733b1509ae9942e77f2a9') version('3.1.4', sha256='ca122a2cdcdffb0fd04f9dfe3493766f298bef02dea2f190f35ea6fdee222b96') + depends_on('python@3.6:', when='@3.2:', type='build') + depends_on('python@2.7:2,3.4:', when='@3.1.6:', type='build') + depends_on('py-setuptools@40.8:', when='@3.1.7:', type='build') depends_on('py-setuptools', type='build') depends_on('py-cffi@1.1:', type=('build', 'run')) depends_on('py-six@1.4.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-bleach/package.py b/var/spack/repos/builtin/packages/py-bleach/package.py index 588295f419..ac94b1065b 100644 --- a/var/spack/repos/builtin/packages/py-bleach/package.py +++ b/var/spack/repos/builtin/packages/py-bleach/package.py @@ -16,8 +16,9 @@ class PyBleach(PythonPackage): version('3.1.0', sha256='3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa') version('1.5.0', sha256='978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65') - depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) + depends_on('python@2.7:2,3.5:', when='@3.1.3:', type=('build', 'run')) + depends_on('python@2.7:2,3.4:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('py-six@1.9.0:', type=('build', 'run')) depends_on('py-webencodings', type=('build', 'run')) - depends_on('py-packaging', type=('test', 'run')) + depends_on('py-packaging', when='@3.1.5:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-decorator/package.py b/var/spack/repos/builtin/packages/py-decorator/package.py index f5230525cb..fc76813ee7 100644 --- a/var/spack/repos/builtin/packages/py-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-decorator/package.py @@ -22,5 +22,6 @@ class PyDecorator(PythonPackage): version('4.3.0', sha256='c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c') version('4.0.9', sha256='90022e83316363788a55352fe39cfbed357aa3a71d90e5f2803a35471de4bba8') + depends_on('python@3.5:', when='@5.0.1:', type=('build', 'run')) depends_on('python@2.6:2.8,3.2:', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pygdal/package.py b/var/spack/repos/builtin/packages/py-pygdal/package.py index 167d7593a8..97d91b4f14 100644 --- a/var/spack/repos/builtin/packages/py-pygdal/package.py +++ b/var/spack/repos/builtin/packages/py-pygdal/package.py @@ -30,6 +30,7 @@ class PyPygdal(PythonPackage): version('1.11.5.3', sha256='746d13b73a284446a1b604772f869789eabfe6e69dee463f537da27845b29fa7') version('1.11.4.3', sha256='99d4b0c94d57ae50592924faaa65cc6a0c0892d83764e9f24ef9270c3a4b111a') + depends_on('python@3.6:', when='@3.3:', type='build') depends_on('py-setuptools', type='build') depends_on('py-numpy@1.0.0:', type=('build', 'run')) # pygdal's build only works with the specified gdal version |