summaryrefslogtreecommitdiff
path: root/wfc3tools
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2018-02-14 16:04:22 -0500
committerGitHub <noreply@github.com>2018-02-14 16:04:22 -0500
commit000f9fe943522e54fcfd0910711bfdbde8785e3b (patch)
treebc1fe80a8a74668743a3b6c8cef29733debe621a /wfc3tools
parentb42445476e8dafef90f7190a9fbf20ef94c1ba78 (diff)
downloadastroconda-contrib-000f9fe943522e54fcfd0910711bfdbde8785e3b.tar.gz
Next (#292)
* Strip x.x selectors * Assign build-time python lock * Minimal build matrix * Numpy locking * Force -m64 on darwin * ds9: add md5 hash * stsci: Remove build section * Replace python calls with env variable; Strip redundant exit conditions * Remove dead packages * sextractor: Use Intel MKL * Use autotools whatever the platform; Switch URL to github mirror (astromatic is too slow) * Force linkage against Intel OpenMP Signed-off-by: Joseph Hunkeler <jhunkeler@gmail.com> * Add version guard template * Remove dead sextractor package * Bump all build revisions * Remove recipes that exist in defaults or no longer serve a purpose * Fixup mosviz requirements * Remove purge_path usage * Remove glue* recipes (favor defaults channel) * Remove pydrizzle * Replace glueviz requirement with glue-core * Remove pytools * Remove pytools dependency * Adjust specviz requirements * pyregion moved to astropy org * Fix d2to1 dependency * Remove d2to1 pip calls * Remove deprecated stsci_sphinx_theme
Diffstat (limited to 'wfc3tools')
-rw-r--r--wfc3tools/bld.bat3
-rw-r--r--wfc3tools/build.sh2
-rw-r--r--wfc3tools/meta.yaml11
3 files changed, 9 insertions, 7 deletions
diff --git a/wfc3tools/bld.bat b/wfc3tools/bld.bat
index 2d6c912..39b5e1f 100644
--- a/wfc3tools/bld.bat
+++ b/wfc3tools/bld.bat
@@ -1,2 +1 @@
-python setup.py install
-if errorlevel 1 exit 1
+%PYTHON% setup.py install
diff --git a/wfc3tools/build.sh b/wfc3tools/build.sh
index 5c61be1..5a5aeeb 100644
--- a/wfc3tools/build.sh
+++ b/wfc3tools/build.sh
@@ -1 +1 @@
-python setup.py install || exit 1
+$PYTHON setup.py install
diff --git a/wfc3tools/meta.yaml b/wfc3tools/meta.yaml
index c5adfd6..ae60327 100644
--- a/wfc3tools/meta.yaml
+++ b/wfc3tools/meta.yaml
@@ -1,6 +1,9 @@
{% set name = 'wfc3tools' %}
{% set version = '1.3.4' %}
-{% set number = '1' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '2' %}
about:
home: https://github.com/spacetelescope/{{ name }}
@@ -17,16 +20,16 @@ package:
requirements:
build:
- astropy >=1.1
- - numpy
+ - numpy {{ numpy }}
- setuptools
- - python x.x
+ - python {{ python }}
- matplotlib
- scipy
- stsci.tools
run:
- astropy >=1.1
- numpy
- - python x.x
+ - python
- stsci.tools
- matplotlib
- scipy