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 /drizzle | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'drizzle')
| -rw-r--r-- | drizzle/bld.bat | 2 | ||||
| -rw-r--r-- | drizzle/build.sh | 2 | ||||
| -rw-r--r-- | drizzle/meta.yaml | 11 | 
3 files changed, 9 insertions, 6 deletions
| diff --git a/drizzle/bld.bat b/drizzle/bld.bat index 762d43b..39b5e1f 100644 --- a/drizzle/bld.bat +++ b/drizzle/bld.bat @@ -1 +1 @@ -python setup.py install +%PYTHON% setup.py install diff --git a/drizzle/build.sh b/drizzle/build.sh index 762d43b..5a5aeeb 100644 --- a/drizzle/build.sh +++ b/drizzle/build.sh @@ -1 +1 @@ -python setup.py install +$PYTHON setup.py install diff --git a/drizzle/meta.yaml b/drizzle/meta.yaml index 431caaf..316ebe6 100644 --- a/drizzle/meta.yaml +++ b/drizzle/meta.yaml @@ -1,6 +1,9 @@  {% set name = 'drizzle' %}  {% set version = '1.5' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{%   set version = version[1:] %} +{% endif %} +{% set number = '1' %}  about:      home: https://github.com/spacetelescope/{{ name }} @@ -22,13 +25,13 @@ requirements:      build:      - astropy >=1.1      - setuptools -    - numpy -    - python x.x +    - numpy {{ numpy }} +    - python {{ python }}      run:      - astropy >=1.1      - numpy -    - python x.x +    - python  test:      imports: | 
