diff options
author | Matt Rendina <mrendina@stsci.edu> | 2017-06-29 09:34:33 -0400 |
---|---|---|
committer | Matt Rendina <mrendina@stsci.edu> | 2017-06-29 09:34:33 -0400 |
commit | 8da2d547b1f7c3919023c3bf32156e13f7d965b8 (patch) | |
tree | 846fb0fc899f60d53c5b8baf482a65963afd64ac | |
parent | 4763b94a693d3546fa6a069fd9e0629523535b18 (diff) | |
download | astroconda-contrib-8da2d547b1f7c3919023c3bf32156e13f7d965b8.tar.gz |
Adjust setup.py on the fly to allow successful build; add missing dep to glue-ginga
-rw-r--r-- | glue-ginga/meta.yaml | 2 | ||||
-rw-r--r-- | mosviz/build.sh | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/glue-ginga/meta.yaml b/glue-ginga/meta.yaml index 069917d..e112622 100644 --- a/glue-ginga/meta.yaml +++ b/glue-ginga/meta.yaml @@ -17,6 +17,7 @@ package: requirements: build: + - scipy - astropy >=1.2 - glueviz >=0.10 - ginga >=2.6.1 @@ -24,6 +25,7 @@ requirements: - numpy - python x.x run: + - scipy - astropy >=1.2 - glueviz >=0.10 - ginga >=2.6.1 diff --git a/mosviz/build.sh b/mosviz/build.sh index 5a5aeeb..2291246 100644 --- a/mosviz/build.sh +++ b/mosviz/build.sh @@ -1 +1,5 @@ +# Remove reference to glueviz from setup script, since this breaks the build +# as there is no file containing 'glueviz' produced for that package since +# glueviz has become a metapackage. +sed -i -e "/'glueviz.*',$/d" setup.py $PYTHON setup.py install |