diff options
Diffstat (limited to 'var')
| -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:') |