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 /nictools | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'nictools')
| -rw-r--r-- | nictools/bld.bat | 3 | ||||
| -rw-r--r-- | nictools/build.sh | 4 | ||||
| -rw-r--r-- | nictools/meta.yaml | 14 |
3 files changed, 11 insertions, 10 deletions
diff --git a/nictools/bld.bat b/nictools/bld.bat index 8d766c9..760380e 100644 --- a/nictools/bld.bat +++ b/nictools/bld.bat @@ -1,3 +1,2 @@ -python setup.py install -if errorlevel 1 exit 1 +%PYTHON% setup.py install diff --git a/nictools/build.sh b/nictools/build.sh index 88ffa4c..5a5aeeb 100644 --- a/nictools/build.sh +++ b/nictools/build.sh @@ -1,3 +1 @@ - -pip install --no-deps --upgrade --force d2to1 -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/nictools/meta.yaml b/nictools/meta.yaml index 5949325..6db4c46 100644 --- a/nictools/meta.yaml +++ b/nictools/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'nictools' %} {% set version = '1.1.3' %} -{% set number = '1' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -16,19 +19,20 @@ package: requirements: build: + - d2to1 + - stsci.distutils - astropy >=1.1 - - numpy + - numpy {{ numpy }} - scipy - - stsci.distutils - stsci.tools - setuptools - - python x.x + - python {{ python }} run: - astropy >=1.1 - numpy - scipy - stsci.tools - - python x.x + - python source: git_tag: {{ version }} |