diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-02-22 08:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 08:53:06 -0500 |
| commit | d4ccb57a335dfda4b3583107767a081691352b2f (patch) | |
| tree | 43dd1892560bcc467c5eaf1373390cefe4707acd /ginga | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'ginga')
| -rw-r--r-- | ginga/bld.bat | 3 | ||||
| -rw-r--r-- | ginga/build.sh | 2 | ||||
| -rw-r--r-- | ginga/meta.yaml | 13 |
3 files changed, 10 insertions, 8 deletions
diff --git a/ginga/bld.bat b/ginga/bld.bat index b290566..760380e 100644 --- a/ginga/bld.bat +++ b/ginga/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/ginga/build.sh b/ginga/build.sh index d0bc088..e8d6a8f 100644 --- a/ginga/build.sh +++ b/ginga/build.sh @@ -1,3 +1,3 @@ echo > README.txt -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install
\ No newline at end of file diff --git a/ginga/meta.yaml b/ginga/meta.yaml index 79fb1ba..e598f09 100644 --- a/ginga/meta.yaml +++ b/ginga/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'ginga' %} {% set version = '2.6.6' %} -{% set tag = 'v2.6.6' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set tag = 'v' ~ version %} +{% set number = '1' %} about: home: https://github.com/ejeschke/{{ name }} @@ -21,14 +24,14 @@ requirements: - qtpy - pillow - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.2 - qtpy - pillow - numpy - - python x.x + - python source: git_tag: {{ tag }} |