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
---
 stsci.skypac/bld.bat   |  3 +--
 stsci.skypac/build.sh  | 28 +---------------------------
 stsci.skypac/meta.yaml | 12 ++++++++----
 3 files changed, 10 insertions(+), 33 deletions(-)

(limited to 'stsci.skypac')

diff --git a/stsci.skypac/bld.bat b/stsci.skypac/bld.bat
index 8d766c9..760380e 100644
--- a/stsci.skypac/bld.bat
+++ b/stsci.skypac/bld.bat
@@ -1,3 +1,2 @@
 
-python setup.py install
-if errorlevel 1 exit 1
+%PYTHON% setup.py install
diff --git a/stsci.skypac/build.sh b/stsci.skypac/build.sh
index 1032cc4..5a5aeeb 100644
--- a/stsci.skypac/build.sh
+++ b/stsci.skypac/build.sh
@@ -1,27 +1 @@
-
-function get_py_version() {
-python --version 2>&1| awk '{sub(/-.*/,"",$2);print $2}'
-}
-export -f get_py_version
-
-function set_py3k() {
-version=`get_py_version`
-major=`echo $version | cut -d '.' -f 1`
-minor=`echo $version | cut -d '.' -f 2`
-hotfix=`echo $version | cut -d '.' -f 3`
-if (( major > 2 )); then
-export PY3K=1
-else
-export PY3K=0
-fi
-}
-export -f set_py3k
-
-set_py3k
-
-
-pip install --no-deps --upgrade --force d2to1
-if [ $PY3K -ne 0 ] ; then
-sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg
-fi
-python setup.py install || exit 1
+$PYTHON setup.py install
diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml
index cc6036c..af1998a 100644
--- a/stsci.skypac/meta.yaml
+++ b/stsci.skypac/meta.yaml
@@ -1,6 +1,9 @@
 {% set name = 'stsci.skypac' %}
 {% set version = '0.9.8' %}
-{% set number = '0' %}
+{% if version[0] == 'v' %}
+{%   set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -17,6 +20,7 @@ package:
 
 requirements:
     build:
+    - d2to1
     - astropy >=1.1
     - stsci.distutils
     - stsci.imagestats
@@ -24,15 +28,15 @@ requirements:
     - stsci.tools
     - stwcs
     - setuptools
-    - numpy
-    - python x.x
+    - numpy {{ numpy }}
+    - python {{ python }}
     run:
     - astropy >=1.1
     - stsci.imagestats
     - stsci.sphere
     - stsci.tools
     - stwcs
-    - python x.x
+    - python
 
 source:
     git_tag: {{ version }}
-- 
cgit