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 /pandokia | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'pandokia')
| -rw-r--r-- | pandokia/bld.bat | 3 | ||||
| -rw-r--r-- | pandokia/build.sh | 2 | ||||
| -rw-r--r-- | pandokia/meta.yaml | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pandokia/bld.bat b/pandokia/bld.bat index b290566..760380e 100644 --- a/pandokia/bld.bat +++ b/pandokia/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/pandokia/build.sh b/pandokia/build.sh index 4b71885..56f0b30 100644 --- a/pandokia/build.sh +++ b/pandokia/build.sh @@ -1,2 +1,2 @@ -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/pandokia/meta.yaml b/pandokia/meta.yaml index 6b9a2ff..1d684a6 100644 --- a/pandokia/meta.yaml +++ b/pandokia/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'pandokia' %} {% set version = '1.3.11' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: http://ssb.stsci.edu/testing/{{ name }} @@ -20,12 +23,12 @@ requirements: - pytest - shunit2 - setuptools - - python x.x + - python {{ python }} run: - nose - shunit2 - pytest - - python x.x + - python source: git_url: https://github.com/spacetelescope/{{ name }}.git |