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)
---
 cubeviz/bld.bat   |  3 +--
 cubeviz/build.sh  |  7 +++++--
 cubeviz/meta.yaml | 21 +++++++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'cubeviz')

diff --git a/cubeviz/bld.bat b/cubeviz/bld.bat
index b290566..760380e 100644
--- a/cubeviz/bld.bat
+++ b/cubeviz/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/cubeviz/build.sh b/cubeviz/build.sh
index 14c64d7..51994e4 100644
--- a/cubeviz/build.sh
+++ b/cubeviz/build.sh
@@ -1,8 +1,11 @@
 # Replace malformed pytest requirement with something sane
-pytest_pattern='s/pytest==*/pytest>=3.1.0/'
+pytest_pattern='s/pytest==/pytest>=/'
+glue_pattern='s/glueviz//'
+numpy_pattern='s|numpy>=1.13|numpy>=1.12|'
+
 for f in setup.*
 do
-    sed -e ${pytest_pattern} "${f}" > "${f}.new"
+    sed -e ${pytest_pattern} -e ${glue_pattern} -e ${numpy_pattern} "${f}" > "${f}.new"
     mv "${f}.new" "${f}"
 done
 
diff --git a/cubeviz/meta.yaml b/cubeviz/meta.yaml
index d6eb520..2bfb0d2 100644
--- a/cubeviz/meta.yaml
+++ b/cubeviz/meta.yaml
@@ -1,8 +1,9 @@
 {% set name = 'cubeviz' %}
-{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0")
-    +".dev"
-    +environ.get("GIT_DESCRIBE_NUMBER", "0") %}
-{% set number = '0' %}
+{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %}
+{% if version[0] == 'v' %}
+{%   set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -19,17 +20,21 @@ package:
 requirements:
     build:
     - asdf
+    - asteval
     - astropy
-    - numpy
-    - pytest >=3.1*
+    - glueviz
+    - numpy {{ numpy }}
+    - pytest
     - setuptools
-    - python
+    - python {{ python }}
 
     run:
     - asdf
+    - asteval
     - astropy
+    - glueviz
     - numpy
-    - pytest >=3.1*
+    - pytest
     - python
 
 source:
-- 
cgit