summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Breitwieser <oliver.breitwieser@kip.uni-heidelberg.de>2019-06-20 00:38:04 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2019-06-19 17:38:04 -0500
commit8b1575fa0af81b7d2f6ecf59dcec969d50b5af1d (patch)
treeea2a3ef331e0d8a001e569fa1ed73a4d2265d0cc
parent6e4ed3e84a65b5eaf760432f19592652170d54f7 (diff)
downloadspack-8b1575fa0af81b7d2f6ecf59dcec969d50b5af1d.tar.gz
spack-8b1575fa0af81b7d2f6ecf59dcec969d50b5af1d.tar.bz2
spack-8b1575fa0af81b7d2f6ecf59dcec969d50b5af1d.tar.xz
spack-8b1575fa0af81b7d2f6ecf59dcec969d50b5af1d.zip
py-matplotlib: Fix dependencies in [2.1.0:3.0.0) (#11787)
Starting with 2.1.0, backports.functools_lru_cache replaces functools32 when using python 2.7.x until python2 support is dropped in 3.0.0. Change-Id: I8db61eac975da0042f6f5babe0f5f0c92807200e
-rw-r--r--var/spack/repos/builtin/packages/py-matplotlib/package.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py
index 0020f06fab..685a1fdfe9 100644
--- a/var/spack/repos/builtin/packages/py-matplotlib/package.py
+++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py
@@ -61,8 +61,10 @@ class PyMatplotlib(PythonPackage):
depends_on('py-pytz', type=('build', 'run'))
depends_on('py-cycler@0.9:', type=('build', 'run'))
depends_on('py-subprocess32', type=('build', 'run'), when='^python@:2.7')
- depends_on('py-functools32', type=('build', 'run'), when='^python@2.7')
+ depends_on('py-functools32', type=('build', 'run'), when='@:2.0.999 ^python@2.7')
depends_on('py-kiwisolver', type=('build', 'run'), when='@2.2.0:')
+ depends_on('py-backports-functools-lru-cache', type=('build', 'run'),
+ when='@2.1.0:2.999.999')
# ------ Optional GUI frameworks
depends_on('tk@8.3:', when='+tk') # not 8.6.0 or 8.6.1