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 /pyds9 | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'pyds9')
| -rw-r--r-- | pyds9/build.sh | 2 | ||||
| -rw-r--r-- | pyds9/meta.yaml | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pyds9/build.sh b/pyds9/build.sh index 762d43b..5a5aeeb 100644 --- a/pyds9/build.sh +++ b/pyds9/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml index a0c5f67..457ccc6 100644 --- a/pyds9/meta.yaml +++ b/pyds9/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pyds9' %} {% set version = "1.9.0.dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/ericmandel/{{ name }} @@ -23,14 +26,14 @@ requirements: - ds9 - six - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy - ds9 - six - numpy - - python x.x + - python source: git_rev: 3761d7ac151f8c8729d0fb6cdba017cadf278283 |