diff options
Diffstat (limited to 'stsci.distutils')
| -rw-r--r-- | stsci.distutils/bld.bat | 8 | ||||
| -rw-r--r-- | stsci.distutils/build.sh | 5 | ||||
| -rw-r--r-- | stsci.distutils/meta.yaml | 11 | 
3 files changed, 9 insertions, 15 deletions
| diff --git a/stsci.distutils/bld.bat b/stsci.distutils/bld.bat index eb68153..39b5e1f 100644 --- a/stsci.distutils/bld.bat +++ b/stsci.distutils/bld.bat @@ -1,7 +1 @@ - -echo This d2to1 hack is deadly. -REM pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/stsci.distutils/build.sh b/stsci.distutils/build.sh index 5e8b365..5a5aeeb 100644 --- a/stsci.distutils/build.sh +++ b/stsci.distutils/build.sh @@ -1,4 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 || exit 1 -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/stsci.distutils/meta.yaml b/stsci.distutils/meta.yaml index 305630a..9199971 100644 --- a/stsci.distutils/meta.yaml +++ b/stsci.distutils/meta.yaml @@ -1,6 +1,9 @@  {% set name = 'stsci.distutils' %}  {% set version = '0.3.8' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{%   set version = version[1:] %} +{% endif %} +{% set number = '2' %}  about:      home: https://github.com/spacetelescope/{{ name }} @@ -19,12 +22,12 @@ requirements:      build:      - d2to1      - setuptools -    - numpy -    - python x.x +    - numpy {{ numpy }} +    - python {{ python }}      run:      - nose      - numpy -    - python x.x +    - python  source:      git_url: https://github.com/spacetelescope/{{ name }}.git | 
