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 /sphinxcontrib-programoutput | |
parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz |
Merge branch 'master' into patch-3
Diffstat (limited to 'sphinxcontrib-programoutput')
-rw-r--r-- | sphinxcontrib-programoutput/bld.bat | 3 | ||||
-rw-r--r-- | sphinxcontrib-programoutput/build.sh | 2 | ||||
-rw-r--r-- | sphinxcontrib-programoutput/meta.yaml | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sphinxcontrib-programoutput/bld.bat b/sphinxcontrib-programoutput/bld.bat index b290566..760380e 100644 --- a/sphinxcontrib-programoutput/bld.bat +++ b/sphinxcontrib-programoutput/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/sphinxcontrib-programoutput/build.sh b/sphinxcontrib-programoutput/build.sh index 4b71885..56f0b30 100644 --- a/sphinxcontrib-programoutput/build.sh +++ b/sphinxcontrib-programoutput/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/sphinxcontrib-programoutput/meta.yaml b/sphinxcontrib-programoutput/meta.yaml index 93c8a4d..1b72504 100644 --- a/sphinxcontrib-programoutput/meta.yaml +++ b/sphinxcontrib-programoutput/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'sphinxcontrib-programoutput' %} {% set version = '0.8' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://pypi.python.org/packages/source/s/{{ name }} @@ -20,10 +23,10 @@ requirements: build: - sphinx - setuptools - - python x.x + - python {{ python }} run: - sphinx - - python x.x + - python source: fn: {{ name }}-{{ version }}.tar.gz |