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 /acstools | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'acstools')
| -rw-r--r-- | acstools/bld.bat | 3 | ||||
| -rw-r--r-- | acstools/build.sh | 2 | ||||
| -rw-r--r-- | acstools/meta.yaml | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/acstools/bld.bat b/acstools/bld.bat index 98bf5c5..39b5e1f 100644 --- a/acstools/bld.bat +++ b/acstools/bld.bat @@ -1,2 +1 @@ -python setup.py install || exit 1 -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/acstools/build.sh b/acstools/build.sh index 5c61be1..5a5aeeb 100644 --- a/acstools/build.sh +++ b/acstools/build.sh @@ -1 +1 @@ -python setup.py install || exit 1 +$PYTHON setup.py install diff --git a/acstools/meta.yaml b/acstools/meta.yaml index 32b9878..5bbe0ad 100644 --- a/acstools/meta.yaml +++ b/acstools/meta.yaml @@ -1,5 +1,8 @@ {% set name = 'acstools' %} {% set version = '2.0.10' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set number = '0' %} about: @@ -15,16 +18,16 @@ requirements: build: - astropy >=1.1 - stsci.tools - - numpy + - numpy {{ numpy }} - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 - scikit-image - stsci.tools - matplotlib - numpy - - python x.x + - python source: git_tag: {{ version }} git_url: https://github.com/spacetelescope/{{ name }}.git |