summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJon Rood <jon.rood@nrel.gov>2019-05-14 13:24:52 -0600
committerPeter Scheibel <scheibel1@llnl.gov>2019-05-15 04:24:52 +0900
commitf7a778af3cf9a472f552b58d34c0f6d411b350e9 (patch)
tree30a64107915a3cf09a1af79aa67c904049c21e39 /var
parent76dd7a92e135b82f811f1b78e5c0333de9a96b70 (diff)
downloadspack-f7a778af3cf9a472f552b58d34c0f6d411b350e9.tar.gz
spack-f7a778af3cf9a472f552b58d34c0f6d411b350e9.tar.bz2
spack-f7a778af3cf9a472f552b58d34c0f6d411b350e9.tar.xz
spack-f7a778af3cf9a472f552b58d34c0f6d411b350e9.zip
Fix py-yt for Python 2 by requesting older py-ipython version (#11416)
* Fix py-yt for Python 2 by requesting older py-ipython version. * Add conflicts statement to py-ipython because version 7: is not compatible with python@2.7
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-ipython/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-yt/package.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py
index 69331e0c68..b26fa7713e 100644
--- a/var/spack/repos/builtin/packages/py-ipython/package.py
+++ b/var/spack/repos/builtin/packages/py-ipython/package.py
@@ -36,3 +36,5 @@ class PyIpython(PythonPackage):
depends_on('py-appnope', type=('build', 'run'),
when=sys.platform == 'darwin' and
int(platform.mac_ver()[0].split('.')[1]) >= 9)
+
+ conflicts('^python@2.7:2.8', when='@7.0.0:')
diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py
index 36122e49c0..6866482ae5 100644
--- a/var/spack/repos/builtin/packages/py-yt/package.py
+++ b/var/spack/repos/builtin/packages/py-yt/package.py
@@ -44,6 +44,7 @@ class PyYt(PythonPackage):
depends_on("py-cython", type=('build', 'run'))
depends_on("py-h5py", type=('build', 'run'), when="+h5py")
depends_on("py-ipython", type=('build', 'run'))
+ depends_on("py-ipython@:6.99", type=('build', 'run'), when="^python@:2.99")
depends_on("py-matplotlib", type=('build', 'run'))
depends_on("py-numpy", type=('build', 'run'))
depends_on("py-scipy", type=('build', 'run'), when="+scipy")