diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2017-01-04 12:59:36 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2017-01-04 12:59:36 -0500 |
| commit | 3b5fc24dfe413f809d8d8838b84adce9c9d3b9ed (patch) | |
| tree | 63e41f437ec4fca75a978a6f4da80f2e14360a07 | |
| parent | ae68d66ae8cab18227fa65ba783f4d58ff7f9276 (diff) | |
| parent | a96a1285ba6cc7b077ba62e2a73d4592dd78003f (diff) | |
| download | astroconda-contrib-3b5fc24dfe413f809d8d8838b84adce9c9d3b9ed.tar.gz | |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into overhaul
| -rw-r--r-- | ginga/meta.yaml | 8 | ||||
| -rw-r--r-- | gwcs/meta.yaml | 10 | ||||
| -rw-r--r-- | imexam/meta.yaml | 2 | ||||
| -rw-r--r-- | pyds9/meta.yaml | 3 | ||||
| -rw-r--r-- | stginga/meta.yaml | 6 | ||||
| -rw-r--r-- | stwcs/meta.yaml | 4 |
6 files changed, 23 insertions, 10 deletions
diff --git a/ginga/meta.yaml b/ginga/meta.yaml index e773340..519fbaf 100644 --- a/ginga/meta.yaml +++ b/ginga/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'ginga' %} -{% set version = '2.6.0' %} +{% set version = '2.6.1' %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '0' %} about: home: https://github.com/ejeschke/{{ name }} @@ -18,12 +18,14 @@ package: requirements: build: - astropy >=1.2 + - qtpy - setuptools - numpy - python x.x run: - astropy >=1.2 - - numpy + - qtpy + - numpy x.x - python x.x source: diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index c70ca11..ee06516 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -12,9 +12,14 @@ build: number: {{ number }} package: +<<<<<<< HEAD name: {{ name }} version: {{ version }} +======= + name: gwcs + version: 0.7 +>>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f requirements: build: - asdf @@ -29,9 +34,14 @@ requirements: - python x.x source: +<<<<<<< HEAD git_tag: {{ tag }} git_url: https://github.com/spacetelescope/{{ name }}.git +======= + git_tag: 0.7 + git_url: https://github.com/spacetelescope/gwcs +>>>>>>> a96a1285ba6cc7b077ba62e2a73d4592dd78003f test: imports: - gwcs diff --git a/imexam/meta.yaml b/imexam/meta.yaml index ba2b8a8..094b043 100644 --- a/imexam/meta.yaml +++ b/imexam/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'imexam' %} -{% set version = '0.6.2' %} +{% set version = '0.6.3' %} {% set tag = 'v' + version %} {% set number = '1' %} diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml index 99539a5..871d8f4 100644 --- a/pyds9/meta.yaml +++ b/pyds9/meta.yaml @@ -1,6 +1,7 @@ {% set name = 'pyds9' %} {% set version = '1.9.0.dev' %} {% set number = '1' %} +{% set buildstr = GIT_BUILD_STR + '_py' + CONDA_PY + '_' + PKG_BUILDNUM %} about: home: https://github.com/ericmandel/{{ name }} @@ -11,7 +12,7 @@ about: build: number: {{ number }} - string: {{ GIT_BUILD_STR }} + string: {{ buildstr }} package: name: {{ name }} diff --git a/stginga/meta.yaml b/stginga/meta.yaml index e47e8f1..b2ddd07 100644 --- a/stginga/meta.yaml +++ b/stginga/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stginga' %} -{% set version = '0.1.2' %} +{% set version = '0.1.3' %} {% set tag = version %} {% set number = '1' %} @@ -17,14 +17,14 @@ package: requirements: build: - - ginga + - ginga >=2.6.1 - astropy >=1.2 - numpy - scipy - setuptools - python x.x run: - - ginga + - ginga >=2.6.1 - astropy >=1.2 - numpy - scipy diff --git a/stwcs/meta.yaml b/stwcs/meta.yaml index a35b3f6..a44c3cb 100644 --- a/stwcs/meta.yaml +++ b/stwcs/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'stwcs' %} -{% set version = '1.2.4' %} -{% set number = '1' %} +{% set version = '1.2.5' %} +{% set number = '0' %} about: home: https://github.com/spacetelescope/{{ name }} |