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
---
 calcos/bld.bat   |  3 +--
 calcos/build.sh  |  4 +---
 calcos/meta.yaml | 11 +++++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'calcos')

diff --git a/calcos/bld.bat b/calcos/bld.bat
index 5d42b68..7fba400 100644
--- a/calcos/bld.bat
+++ b/calcos/bld.bat
@@ -1,4 +1,3 @@
 
 
-python setup.py install
-if errorlevel 1 exit 1
\ No newline at end of file
+%PYTHON% setup.py install
diff --git a/calcos/build.sh b/calcos/build.sh
index 52582b9..b442f84 100644
--- a/calcos/build.sh
+++ b/calcos/build.sh
@@ -1,4 +1,2 @@
-
-pip install --no-deps --upgrade --force d2to1
 sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg
-python setup.py install || exit 1
\ No newline at end of file
+$PYTHON setup.py install
diff --git a/calcos/meta.yaml b/calcos/meta.yaml
index 8e139e0..1243415 100644
--- a/calcos/meta.yaml
+++ b/calcos/meta.yaml
@@ -1,6 +1,9 @@
 {% set name = 'calcos' %}
 {% set version = '3.2.1' %}
-{% set number = '0' %}
+{% if version[0] == 'v' %}
+{%   set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -21,14 +24,14 @@ requirements:
     - stsci.distutils
     - stsci.tools
     - setuptools
-    - numpy
-    - python x.x
+    - numpy {{ numpy }}
+    - python {{ python }}
     run:
     - astropy >=1.1
     - scipy
     - stsci.tools
     - numpy
-    - python x.x
+    - python
 
 source:
     git_tag: {{ version }}
-- 
cgit