summaryrefslogtreecommitdiff
path: root/photutils
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 /photutils
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 'photutils')
-rw-r--r--photutils/bld.bat3
-rw-r--r--photutils/build.sh2
-rw-r--r--photutils/meta.yaml9
3 files changed, 8 insertions, 6 deletions
diff --git a/photutils/bld.bat b/photutils/bld.bat
index b290566..760380e 100644
--- a/photutils/bld.bat
+++ b/photutils/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/photutils/build.sh b/photutils/build.sh
index 5c61be1..5a5aeeb 100644
--- a/photutils/build.sh
+++ b/photutils/build.sh
@@ -1 +1 @@
-python setup.py install || exit 1
+$PYTHON setup.py install
diff --git a/photutils/meta.yaml b/photutils/meta.yaml
index a0be16b..4e40235 100644
--- a/photutils/meta.yaml
+++ b/photutils/meta.yaml
@@ -1,7 +1,10 @@
{% set name = 'photutils' %}
{% set version = '0.4' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
{% set tag = 'v' + version %}
-{% set number = '0' %}
+{% set number = '1' %}
about:
home: https://github.com/astropy/{{ name }}
@@ -26,7 +29,7 @@ requirements:
- scipy >=0.16
- six
- setuptools
- - python x.x
+ - python {{ python }}
run:
- astropy >=2.0
- cython
@@ -37,7 +40,7 @@ requirements:
- scipy >=0.16
- six
- setuptools
- - python x.x
+ - python
source:
git_tag: {{ tag }}