From 1036d8a1201d335288dd6c426c3e146dfd2750b0 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunk@stsci.edu>
Date: Wed, 20 Apr 2016 00:05:28 -0400
Subject: Major dependency overhaul for jwst_*

---
 jwst_lib/meta.yaml      | 12 ++++++++----
 jwst_pipeline/meta.yaml | 18 +++++++++++++++---
 jwst_tools/build.sh     |  8 ++++++--
 jwst_tools/meta.yaml    | 14 ++++++++++++--
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/jwst_lib/meta.yaml b/jwst_lib/meta.yaml
index 1b3c36a..bd9b7a6 100644
--- a/jwst_lib/meta.yaml
+++ b/jwst_lib/meta.yaml
@@ -17,19 +17,23 @@ package:
 requirements:
     build:
     - d2to1
-    - asdf-standard
+    - asdf
     - astropy >=1.1
     - crds
-    - asdf
+    - gwcs
+    - jsonschema
     - stsci.distutils
+    - nose
     - numpy x.x
     - setuptools
     - python x.x
     run:
-    - asdf-standard
+    - asdf
     - astropy >=1.1
     - crds
-    - asdf
+    - gwcs
+    - nose
+    - jsonschema
     - numpy x.x
     - python x.x
 source:
diff --git a/jwst_pipeline/meta.yaml b/jwst_pipeline/meta.yaml
index dad8aac..1b27156 100644
--- a/jwst_pipeline/meta.yaml
+++ b/jwst_pipeline/meta.yaml
@@ -18,17 +18,29 @@ requirements:
     build:
     - d2to1
     - astropy >=1.1
+    - asdf
+    - crds
+    - cython
+    - drizzlepac
+    - gwcs
     - jwst_lib
-    - stsci.convolve
+    - matplotlib
+    - scipy
     - stsci.distutils
-    - numpy x.x
     - setuptools
+    - numpy x.x
     - python x.x
     run:
     - astropy >=1.1
+    - asdf
+    - crds
+    - cython
+    - drizzlepac
+    - gwcs
     - jwst_lib
+    - matplotlib
+    - scipy
     - numpy x.x
-    - stsci.convolve
     - python x.x
 source:
     git_url: ssh://git@bitbucket.org/stsci_ssb/jwst.git
diff --git a/jwst_tools/build.sh b/jwst_tools/build.sh
index 1883596..dc3b810 100644
--- a/jwst_tools/build.sh
+++ b/jwst_tools/build.sh
@@ -5,5 +5,9 @@ rm -rf jwst_tools/timeconversion
 
 for d in jwst_tools/*
 do
-( cd $d && python setup.py install || exit 1 )
-done
\ No newline at end of file
+    if [[ $d == *spectools* ]]; then
+        # Indentation errors in package
+        continue
+    fi
+    ( cd $d && python setup.py install || exit 1 )
+done
diff --git a/jwst_tools/meta.yaml b/jwst_tools/meta.yaml
index ed1178f..3c53684 100644
--- a/jwst_tools/meta.yaml
+++ b/jwst_tools/meta.yaml
@@ -18,15 +18,25 @@ requirements:
     build:
     - d2to1
     - astropy >=1.1
+    - jwst_lib
+    - matplotlib
+    - nose
+    - scipy
+    - six
     - stsci.distutils
     - stsci.tools
-    - numpy x.x
     - setuptools
+    - numpy x.x
     - python x.x
     run:
     - astropy >=1.1
-    - numpy x.x
+    - jwst_lib
+    - matplotlib
+    - nose
+    - scipy
+    - six
     - stsci.tools
+    - numpy x.x
     - python x.x
 source:
     git_url: ssh://git@bitbucket.org/stsci_ssb/jwst.git
-- 
cgit