diff options
| author | George Hartzell <hartzell@alerce.com> | 2019-11-14 14:26:44 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-11-14 16:26:44 -0600 |
| commit | 7a6c7f23a0eedbd63963a98451ac5516327c0a22 (patch) | |
| tree | 6f244617641cc0794ae2fefc42b8cf9074a69c2e | |
| parent | 8490587c769d4bc78c2505941db49faed0a42393 (diff) | |
| download | spack-7a6c7f23a0eedbd63963a98451ac5516327c0a22.tar.gz spack-7a6c7f23a0eedbd63963a98451ac5516327c0a22.tar.bz2 spack-7a6c7f23a0eedbd63963a98451ac5516327c0a22.tar.xz spack-7a6c7f23a0eedbd63963a98451ac5516327c0a22.zip | |
py-matplotlib only needs backports when ^python@:2 (#13712)
* py-matplotlib only needs backports when ^python@:2
This implements @scheibelp's suggestion in #13711.
py-matplotlib should only depends_on py-backports-functools-lru-cache
when it's using a python that actually *needs* it.
See #13711 for details.
* Don't depend_ons py-enum34 unless python@:3.3
* Tighten up enum34 dependency
@adamjstewart cracked open the setup.py files and suggested a tighter
dependency for py-enum34. 1.4 and 1.5 only require it for pythons
before 3.4, 1.3 requires it unconditionally. So...., we'll do the
same.
* Remove conflict on python 3.4 from enum34
at @adamjstewart's request see PR notes
| -rw-r--r-- | var/spack/repos/builtin/packages/py-enum34/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-matplotlib/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-multiqc/package.py | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py index ee2d3e2ac6..98f7fb088f 100644 --- a/var/spack/repos/builtin/packages/py-enum34/package.py +++ b/var/spack/repos/builtin/packages/py-enum34/package.py @@ -15,6 +15,5 @@ class PyEnum34(PythonPackage): version('1.1.6', sha256='8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1') depends_on('python') - conflicts('python@3.4:') depends_on('py-ordereddict', when='^python@:2.6', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index dfefbf0175..f51f9690c1 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -85,7 +85,7 @@ class PyMatplotlib(PythonPackage): depends_on('py-subprocess32', type=('build', 'run'), when='^python@:2.7') depends_on('py-functools32', type=('build', 'run'), when='@:2.0.999 ^python@2.7') depends_on('py-backports-functools-lru-cache', type=('build', 'run'), - when='@2.1.0:2.999.999') + when='@2.1.0:2.999.999 ^python@:2') depends_on('py-six@1.9.0:', type=('build', 'run'), when='@:2') # Optional backend dependencies diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index 52d2a2bcbc..b099cb9a36 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -31,5 +31,6 @@ class PyMultiqc(PythonPackage): depends_on('py-pyyaml', type=('build', 'run')) depends_on('py-simplejson', type=('build', 'run')) depends_on('py-requests', type=('build', 'run'), when='@1.5:') - depends_on('py-enum34', type=('build', 'run'), when='@1.5:') + depends_on('py-enum34', type=('build', 'run'), when='@1.4:1.5 ^python@:3.3') + depends_on('py-enum34', type=('build', 'run'), when='@1.3') depends_on('py-markdown', type=('build', 'run'), when='@1.5:') |