diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-06-29 09:38:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-29 09:38:45 -0400 |
| commit | 6dafd6fe97c46a3f77a944e35d90e46fe5f2739f (patch) | |
| tree | f718eae8db2d860245db78d929e03b7d52d73890 | |
| parent | 44b09dced116808a3cdb05a0beb3c678eb4395d8 (diff) | |
| parent | 8da2d547b1f7c3919023c3bf32156e13f7d965b8 (diff) | |
| download | astroconda-contrib-6dafd6fe97c46a3f77a944e35d90e46fe5f2739f.tar.gz | |
Merge pull request #231 from rendinam/glue-related
Correct ripples from glue-related package shuffle
| -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 |