diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-09-15 11:20:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 11:20:37 -0400 |
| commit | f070159b78f7d26c5b1b84fa21146b855d3f91c1 (patch) | |
| tree | b3c69ddb7d8b6b7fd33d5d637324c4ca985eea74 | |
| parent | 202882e4384610015ee50ab424dd412f76e55a11 (diff) | |
| parent | 61821afa087a820a75200c448eb1bb0909fdeb11 (diff) | |
| download | astroconda-contrib-f070159b78f7d26c5b1b84fa21146b855d3f91c1.tar.gz | |
Merge pull request #261 from rendinam/fix_deps
Fix circular dependency; recipe standardization
| -rw-r--r-- | glue-ginga/meta.yaml | 5 | ||||
| -rw-r--r-- | glueviz/meta.yaml | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/glue-ginga/meta.yaml b/glue-ginga/meta.yaml index 069917d..4a6ebf3 100644 --- a/glue-ginga/meta.yaml +++ b/glue-ginga/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'glue-ginga' %} {% set version = '0.1.1' %} {% set tag = 'v' + version %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/ejeschke/{{ name }} @@ -18,7 +18,8 @@ package: requirements: build: - astropy >=1.2 - - glueviz >=0.10 + - glue-core >=0.11.1 + - glue-vispy-viewers >=0.8 - ginga >=2.6.1 - setuptools - numpy diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml index 343abf7..cea8e5b 100644 --- a/glueviz/meta.yaml +++ b/glueviz/meta.yaml @@ -4,7 +4,7 @@ {% set name = 'glueviz' %} {% set version = '0.11.1' %} -{% set number = '0' %} +{% set number = '1' %} package: name: {{ name }} @@ -20,13 +20,6 @@ build: script: python setup.py install --single-version-externally-managed --record record.txt requirements: - build: - - python - - setuptools - - glue-core >=0.11.1 - - glue-vispy-viewers >=0.8 - - glue-ginga - run: - glue-core >=0.11.1 - glue-vispy-viewers >=0.8 |