From 000f9fe943522e54fcfd0910711bfdbde8785e3b Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@users.noreply.github.com>
Date: Wed, 14 Feb 2018 16:04:22 -0500
Subject: 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
---
 pyraf/bld.bat   |  4 +---
 pyraf/build.sh  |  2 +-
 pyraf/meta.yaml | 11 +++++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'pyraf')

diff --git a/pyraf/bld.bat b/pyraf/bld.bat
index 976d3b9..7fba400 100644
--- a/pyraf/bld.bat
+++ b/pyraf/bld.bat
@@ -1,5 +1,3 @@
 
-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/pyraf/build.sh b/pyraf/build.sh
index 3974e86..08480f2 100644
--- a/pyraf/build.sh
+++ b/pyraf/build.sh
@@ -12,4 +12,4 @@ set +e
     fi
 fi
 
-python setup.py install || exit 1
+$PYTHON setup.py install
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml
index 2380480..e75dbba 100644
--- a/pyraf/meta.yaml
+++ b/pyraf/meta.yaml
@@ -1,6 +1,9 @@
 {% set name = 'pyraf' %}
 {% set version = '2.1.11' %}
-{% set number = '1' %}
+{% if version[0] == 'v' %}
+{%   set version = version[1:] %}
+{% endif %}
+{% set number = '2' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -26,8 +29,8 @@ requirements:
     - pyobjc-framework-quartz >=3.0.4 [osx]
     - stsci.tools
     - setuptools
-    - numpy
-    - python x.x
+    - numpy {{ numpy }}
+    - python {{ python }}
     run:
     - astropy >=1.1
     - ipython
@@ -37,7 +40,7 @@ requirements:
     - pyobjc-framework-quartz >=3.0.4 [osx]
     - stsci.tools
     - numpy
-    - python x.x
+    - python
 
 source:
     git_tag: {{ version }}
-- 
cgit