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 /astroimtools | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'astroimtools')
| -rw-r--r-- | astroimtools/bld.bat | 3 | ||||
| -rw-r--r-- | astroimtools/build.sh | 2 | ||||
| -rw-r--r-- | astroimtools/meta.yaml | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/astroimtools/bld.bat b/astroimtools/bld.bat index c50c85a..00f8037 100644 --- a/astroimtools/bld.bat +++ b/astroimtools/bld.bat @@ -1,3 +1,2 @@ -python setup.py install --offline -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install --offline diff --git a/astroimtools/build.sh b/astroimtools/build.sh index b875087..ca28bfc 100644 --- a/astroimtools/build.sh +++ b/astroimtools/build.sh @@ -1,2 +1,2 @@ -python setup.py install --offline || exit 1
\ No newline at end of file +$PYTHON setup.py install --offline
\ No newline at end of file diff --git a/astroimtools/meta.yaml b/astroimtools/meta.yaml index 520d4d7..a3355c5 100644 --- a/astroimtools/meta.yaml +++ b/astroimtools/meta.yaml @@ -1,7 +1,10 @@ {% set name = 'astroimtools' %} {% set version = '0.1.1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -21,14 +24,14 @@ requirements: - cython - matplotlib - setuptools - - numpy - - python x.x + - numpy {{ numpy }} + - python {{ python }} run: - astropy >=1.1 - cython - matplotlib - numpy - - python x.x + - python source: git_tag: {{ tag }} |