summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMatthew Krafczyk <krafczyk.matthew@gmail.com>2017-01-17 15:31:49 -0600
committerMatthew Krafczyk <krafczyk.matthew@gmail.com>2017-01-17 15:31:49 -0600
commit65be1a93f1974da102c476d22c035a1073ce804c (patch)
tree0634af8687efbb296dbab93fd35cd412e8417fc4 /var
parente2d4dadf33f10ccb5c77d491a0dd5060311516ef (diff)
parentfa39273e1fb1cf12b1be3083918f12699025e802 (diff)
downloadspack-65be1a93f1974da102c476d22c035a1073ce804c.tar.gz
spack-65be1a93f1974da102c476d22c035a1073ce804c.tar.bz2
spack-65be1a93f1974da102c476d22c035a1073ce804c.tar.xz
spack-65be1a93f1974da102c476d22c035a1073ce804c.zip
Merge branch 'update/yt-rockstar' into yt-dev-working-branch
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-yt/package.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py
index 2735ca8bc1..547024fe43 100644
--- a/var/spack/repos/builtin/packages/py-yt/package.py
+++ b/var/spack/repos/builtin/packages/py-yt/package.py
@@ -53,7 +53,11 @@ class PyYt(Package):
variant("astropy", default=True, description="enable astropy support")
variant("h5py", default=True, description="enable h5py support")
variant("scipy", default=True, description="enable scipy support")
+<<<<<<< HEAD
variant("devmode", default=False, description="enable development mode")
+=======
+ variant("rockstar", default=False, description="enable rockstar support")
+>>>>>>> update/yt-rockstar
extends("python")
@@ -66,6 +70,7 @@ class PyYt(Package):
depends_on("py-scipy", type=('build', 'run'), when="+scipy")
depends_on("py-setuptools", type="build")
depends_on("py-sympy", type=('build', 'run'))
+ depends_on("rockstar@yt", type=('build', 'run'), when="+rockstar")
depends_on("python @2.7:2.999,3.4:")
def install(self, spec, prefix):
@@ -73,6 +78,13 @@ class PyYt(Package):
setup_py("develop", "--prefix=%s" % prefix)
else:
setup_py("install", "--prefix=%s" % prefix)
+ if '+rockstar' in spec:
+ if os.path.exists('rockstar.cfg'):
+ os.remove('rockstar.cfg')
+ rockstar_cfg = open('rockstar.cfg', 'w')
+ rockstar_cfg.write(spec.get_dependency('rockstar').spec.prefix)
+ rockstar_cfg.close()
+ setup_py("install", "--prefix=%s" % prefix)
self.check_install(spec, prefix)
def check_install(self, spec, prefix):