From 286c9d0cd069759d090007da647e78afdb937596 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@users.noreply.github.com>
Date: Fri, 5 Jan 2018 15:01:53 -0500
Subject: [WIP] Next (#75)

* Purge x.x style selectors

* Add python jinja2 selectors

* Add numpy jinja2 selectors

* Add basic build matrix configuration

* Delete iraf package; see astroconda/astroconda-iraf

* Bump all build revisions

* Remove drizzlepac and nose dependencies

* Fixup dependencies

* Strip newlines in version declaration

* Implements new package versioning scheme

* Revert sandboxing

* Purge old or unnecessary packages

* Clean up meta-packages

* Use fake version

* Minor clean up

* Add missing md5 hashes

* Python is not a dependency of XPA

* Remove GIT_ usage in non-git recipe

* Initial commit of asteval

* cubeviz: sed patching glue/numpy/pytest

* Add missing curly braces

* Remove references to pywcs

* Add mosviz

* Fix up specutils

* Forcefully strip all "v" version prefixes. Please stop using them.

* Fix ginga

* Use PYTHON

* Remove d2to1 dep

* Remove d2to1 dep

* Remove d2to1 dep

* Remove d2to1 dep

* Remove deprecated JWST pipeline packages

* Simplify python builds

* Simplify python builds (windows)

* Remove d2to1 dep

* Remove d2to1 dep

* Stop using 2to3

* Remove ATLAS

* Move sextractor to mainline

* Sextractor Intel MKL integration patches (i.e NO ATLAS)
---
 wfpc2tools/bld.bat   |  4 +---
 wfpc2tools/build.sh  |  2 +-
 wfpc2tools/meta.yaml | 15 ++++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'wfpc2tools')

diff --git a/wfpc2tools/bld.bat b/wfpc2tools/bld.bat
index 976d3b9..7fba400 100644
--- a/wfpc2tools/bld.bat
+++ b/wfpc2tools/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/wfpc2tools/build.sh b/wfpc2tools/build.sh
index 5b1a523..d8b4616 100644
--- a/wfpc2tools/build.sh
+++ b/wfpc2tools/build.sh
@@ -25,4 +25,4 @@ if [ $PY3K -ne 0 ] ; then
 2to3 -w .
 fi
 
-python setup.py install || exit 1
\ No newline at end of file
+$PYTHON setup.py install
diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml
index 56e66cf..337e85b 100644
--- a/wfpc2tools/meta.yaml
+++ b/wfpc2tools/meta.yaml
@@ -1,8 +1,9 @@
 {% set name = 'wfpc2tools' %}
-{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0")
-    +".dev"
-    +environ.get("GIT_DESCRIBE_NUMBER", "0") %}
-{% set number = '1' %}
+{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %}
+{% if version[0] == 'v' %}
+{%   set version = version[1:] %}
+{% endif %}
+{% set number = '2' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -25,15 +26,15 @@ requirements:
     - stsci.imagestats
     - stsci.tools
     - setuptools
-    - numpy
-    - python x.x
+    - numpy {{ numpy }}
+    - python {{ python }}
     run:
     - astropy
     - scipy
     - stsci.imagestats
     - stsci.tools
     - numpy
-    - python x.x
+    - python
 
 source:
     git_url: https://github.com/spacetelescope/{{ name }}.git
-- 
cgit