Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into update-crds-version to resolve version conflicts.

26 files changed, 217 insertions, 74 deletions

diff --git a/cubeviz/meta.yaml b/cubeviz/meta.yaml
index 54745dc..b864b78 100644
--- a/cubeviz/meta.yaml
+++ b/cubeviz/meta.yaml
@@ -1,6 +1,7 @@
 {% set name = 'cubeviz' %}
-{% set version = '0.0.2' %}
-{% set number = '1' %}
+{% set version = '0.2.0' %}
+{% set tag = version %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -19,7 +20,7 @@ requirements:
     - asdf
     - asteval
     - astropy
-    - glue-core >=0.12.0
+    - glue-core >=0.13
     - numpy {{ numpy }}
     - pytest
     - setuptools
@@ -29,9 +30,10 @@ requirements:
     - asdf
     - asteval
     - astropy
-    - glue-core >=0.12.0
+    - glue-core >=0.13
     - numpy
     - pytest
+    - specviz >=0.5.0
     - python
 
 source:
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat
index d6d7ec3..0702784 100644
--- a/drizzlepac/bld.bat
+++ b/drizzlepac/bld.bat
@@ -1,3 +1,6 @@
+pip install --no-deps --upgrade sphinx-automodapi
+if errorlevel 1 exit 1
+
 %PYTHON% setup.py build build_ext --inplace -- build_sphinx
 if errorlevel 1 exit 1
 
diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh
index ccf863b..c975904 100644
--- a/drizzlepac/build.sh
+++ b/drizzlepac/build.sh
@@ -1,2 +1,4 @@
+pip install --no-deps --upgrade sphinx-automodapi
+
 $PYTHON setup.py build build_ext --inplace -- build_sphinx
 $PYTHON setup.py install
diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml
index acc2012..81a890b 100644
--- a/drizzlepac/meta.yaml
+++ b/drizzlepac/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = 'drizzlepac' %}
-{% set version = '2.2.2' %}
+{% set version = '2.2.3' %}
 {% set number = '0' %}
 
 about:
diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml
index 195db8d..fc74a33 100644
--- a/gwcs/meta.yaml
+++ b/gwcs/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = 'gwcs' %}
-{% set version = '0.8.0' %}
+{% set version = '0.9.1' %}
 {% set number = '1' %}
 
 about:
diff --git a/pandokia/meta.yaml b/pandokia/meta.yaml
index 3fce091..2408d2d 100644
--- a/pandokia/meta.yaml
+++ b/pandokia/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'pandokia' %}
-{% set version = '1.3.11' %}
-{% set number = '2' %}
+{% set version = '2.3.0' %}
+{% set number = '0' %}
 
 about:
     home: http://ssb.stsci.edu/testing/{{ name }}
diff --git a/poppy/meta.yaml b/poppy/meta.yaml
index 972d36c..52ce202 100644
--- a/poppy/meta.yaml
+++ b/poppy/meta.yaml
@@ -1,7 +1,7 @@
 {% set name = 'poppy' %}
-{% set version = '0.6.1' %}
+{% set version = '0.7.0' %}
 {% set tag = 'v' + version %}
-{% set number = '1' %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/mperrin/{{ name }}
@@ -19,20 +19,20 @@ package:
 
 requirements:
     build:
-    - astropy >=1.1
+    - astropy >=1.3
     - numpy {{ numpy }}
-    - scipy
-    - matplotlib
-    - six [py27]
+    - scipy >=0.14.0
+    - matplotlib >=1.3.0
+    - six
     - enum34 [py27]
     - setuptools
     - python {{ python }}
     run:
     - astropy >=1.1
     - numpy
-    - scipy
-    - matplotlib
-    - six [py27]
+    - scipy >=0.14.0
+    - matplotlib >=1.3.0
+    - six
     - enum34 [py27]
     - setuptools
     - python
diff --git a/pyopengl-accelerate/bld.bat b/pyopengl-accelerate/bld.bat
new file mode 100644
index 0000000..85a7bc3
--- /dev/null
+++ b/pyopengl-accelerate/bld.bat
@@ -0,0 +1,2 @@
+%PYTHON% setup.py install
+if errorlevel 1 exit 1
diff --git a/pyopengl-accelerate/build.sh b/pyopengl-accelerate/build.sh
new file mode 100644
index 0000000..5a5aeeb
--- /dev/null
+++ b/pyopengl-accelerate/build.sh
@@ -0,0 +1 @@
+$PYTHON setup.py install
diff --git a/pyopengl-accelerate/meta.yaml b/pyopengl-accelerate/meta.yaml
new file mode 100644
index 0000000..3ed4155
--- /dev/null
+++ b/pyopengl-accelerate/meta.yaml
@@ -0,0 +1,42 @@
+{% set badname = "PyOpenGL-accelerate" %}
+{% set name = badname|lower %}
+{% set version = "3.1.1a1" %}
+{% set number = '0' %}
+{% set file_ext = "tar.gz" %}
+{% set hash_type = "sha256" %}
+{% set hash_value = "3d37af9f2565febf214e1da2a5fe019561992d34026ce2a5f51972e121b84cdd" %}
+
+about:
+  home: http://pyopengl.sourceforge.net
+  license: BSD License
+  summary: Acceleration code for PyOpenGL
+  description: "Acceleration code for PyOpenGL\n\nThis set of C (Cython) extensions provides acceleration of common operations\nfor slow points in PyOpenGL 3.x."
+
+package:
+  name: '{{ name }}'
+  version: '{{ version }}'
+
+source:
+  fn: '{{ badname }}-{{ version }}.{{ file_ext }}'
+  url: https://pypi.io/packages/source/{{ badname[0] }}/{{ badname }}/{{ badname }}-{{ version }}.{{ file_ext }}
+  '{{ hash_type }}': '{{ hash_value }}'
+
+build:
+  number: {{ number }}
+
+requirements:
+  build:
+    - cython
+    - numpy {{ numpy }}
+    - pyopengl =={{ version }}
+    - python {{ python }}
+    - setuptools
+
+  run:
+    - numpy
+    - pyopengl =={{ version }}
+    - python
+
+test:
+  imports:
+    - OpenGL_accelerate
diff --git a/pyopengl/bld.bat b/pyopengl/bld.bat
new file mode 100644
index 0000000..85a7bc3
--- /dev/null
+++ b/pyopengl/bld.bat
@@ -0,0 +1,2 @@
+%PYTHON% setup.py install
+if errorlevel 1 exit 1
diff --git a/pyopengl/build.sh b/pyopengl/build.sh
new file mode 100644
index 0000000..5a5aeeb
--- /dev/null
+++ b/pyopengl/build.sh
@@ -0,0 +1 @@
+$PYTHON setup.py install
diff --git a/pyopengl/meta.yaml b/pyopengl/meta.yaml
new file mode 100644
index 0000000..b7b47d3
--- /dev/null
+++ b/pyopengl/meta.yaml
@@ -0,0 +1,37 @@
+{% set badname = "PyOpenGL" %}
+{% set name = badname|lower %}
+{% set version = "3.1.1a1" %}
+{% set number = '0' %}
+{% set file_ext = "tar.gz" %}
+{% set hash_type = "sha256" %}
+{% set hash_value = "c96d909b359abe3271b746bacf7e6ba52935141e2406a8f90231e4e44dfa4075" %}
+
+about:
+  home: http://pyopengl.sourceforge.net
+  license: BSD License
+  summary: Standard OpenGL bindings for Python
+
+package:
+  name: '{{ name }}'
+  version: '{{ version }}'
+
+source:
+  fn: '{{ badname }}-{{ version }}.{{ file_ext }}'
+  url: https://pypi.io/packages/source/{{ badname[0] }}/{{ badname }}/{{ badname }}-{{ version }}.{{ file_ext }}
+  '{{ hash_type }}': '{{ hash_value }}'
+
+build:
+  number: {{ number }}
+
+requirements:
+  build:
+    - python {{ python }}
+    - setuptools
+
+  run:
+    - python
+
+test:
+  imports:
+    - OpenGL
+    - OpenGL.GL
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml
index 75b8342..070cadf 100644
--- a/pyraf/meta.yaml
+++ b/pyraf/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = 'pyraf' %}
-{% set version = '2.1.14' %}
+{% set version = '2.1.15' %}
 {% set number = '0' %}
 
 about:
diff --git a/pysiaf/bld.bat b/pysiaf/bld.bat
new file mode 100644
index 0000000..760380e
--- /dev/null
+++ b/pysiaf/bld.bat
@@ -0,0 +1,2 @@
+
+%PYTHON% setup.py install
diff --git a/pysiaf/build.sh b/pysiaf/build.sh
new file mode 100644
index 0000000..56f0b30
--- /dev/null
+++ b/pysiaf/build.sh
@@ -0,0 +1,2 @@
+
+$PYTHON setup.py install
\ No newline at end of file
diff --git a/pysiaf/meta.yaml b/pysiaf/meta.yaml
new file mode 100644
index 0000000..588d833
--- /dev/null
+++ b/pysiaf/meta.yaml
@@ -0,0 +1,45 @@
+{% set name = 'pysiaf' %}
+{% set version = '0.1.8' %}
+{% set tag = version %}
+{% set number = '0' %}
+
+about:
+    home: https://github.com/spacetelescope/{{ name }}
+    license: BSD
+    summary: 
+        Handling of Science Instrument Aperture Files (SIAF) for space telescopes
+
+source:
+    git_tag: {{ tag }}
+    git_url: https://github.com/spacetelescope/{{ name }}.git
+
+package:
+    name: {{ name }}
+    version: {{ version }}
+
+build:
+    number: {{ number }}
+    
+requirements:
+    build:
+    - astropy >=1.2
+    - numpy >=1.9
+    - matplotlib >=1.4.3
+    - lxml >=3.6.4
+    - scipy >=0.17
+    - openpyxl >=2.4
+    - python {{ python }}
+    - setuptools
+    
+    run:
+    - astropy >=1.2
+    - numpy >=1.9
+    - matplotlib >=1.4.3
+    - lxml >=3.6.4
+    - scipy >=0.17
+    - openpyxl >=2.4
+    - python {{ python }}
+
+test:
+    imports:
+      - pysiaf
diff --git a/specviz/meta.yaml b/specviz/meta.yaml
index 141761f..6e1b9c8 100644
--- a/specviz/meta.yaml
+++ b/specviz/meta.yaml
@@ -1,7 +1,7 @@
 {% set name = 'specviz' %}
-{% set version = '0.4.4' %}
+{% set version = '0.5.0' %}
 {% set tag = 'v' + version %}
-{% set number = '1' %}
+{% set number = '0' %}
 
 package:
   name: {{ name }}
diff --git a/spherical-geometry/meta.yaml b/spherical-geometry/meta.yaml
index e4ad457..2b0f2fc 100644
--- a/spherical-geometry/meta.yaml
+++ b/spherical-geometry/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'spherical-geometry' %}
 {% set reponame = 'spherical_geometry' %}
-{% set version = '1.0.12' %}
+{% set version = '1.2.2' %}
 {% set number = '1' %}
 
 about:
diff --git a/stsci.convolve/meta.yaml b/stsci.convolve/meta.yaml
index 5156e2f..99113fa 100644
--- a/stsci.convolve/meta.yaml
+++ b/stsci.convolve/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'stsci.convolve' %}
-{% set version = '2.2.1' %}
-{% set number = '1' %}
+{% set version = '2.2.2' %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -17,13 +17,13 @@ package:
 
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
-    - numpy {{ numpy }}
-    - python {{ python }}
+      - d2to1
+      - stsci.distutils
+      - numpy {{ numpy }}
+      - python {{ python }}
     run:
-    - numpy
-    - python
+      - numpy
+      - python
 
 source:
     git_tag: {{ version }}
@@ -31,4 +31,4 @@ source:
 
 test:
     imports:
-    - stsci.convolve
+      - stsci.convolve
diff --git a/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml
index 3c8218c..d92854d 100644
--- a/stsci.imagestats/meta.yaml
+++ b/stsci.imagestats/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'stsci.imagestats' %}
-{% set version = '1.4.1' %}
-{% set number = '2' %}
+{% set version = '1.4.2' %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -18,18 +18,19 @@ package:
 
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
-    - setuptools
-    - numpy {{ numpy }}
-    - python {{ python }}
+      - d2to1
+      - stsci.distutils
+      - setuptools
+      - numpy {{ numpy }}
+      - python {{ python }}
+
     run:
-    - numpy
-    - python
+      - numpy
+      - python
 
 source:
     git_url: https://github.com/spacetelescope/{{ name }}.git
 
 test:
     imports:
-    - stsci.imagestats
+      - stsci.imagestats
diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml
index f9aaa3e..2609221 100644
--- a/stsci.skypac/meta.yaml
+++ b/stsci.skypac/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'stsci.skypac' %}
-{% set version = '0.9.10' %}
-{% set number = '1' %}
+{% set version = '0.9.12' %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -17,20 +17,19 @@ package:
 
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
-    - stsci.distutils
     - stsci.imagestats
-    - spherical-geometry
+    - spherical-geometry >=1.2.2
     - stsci.tools
     - stwcs
+    - sphinx
     - setuptools
     - numpy {{ numpy }}
     - python {{ python }}
     run:
     - astropy >=1.1
     - stsci.imagestats
-    - spherical-geometry
+    - spherical-geometry >=1.2.2
     - stsci.tools
     - stwcs
     - python
diff --git a/stsci.stimage/meta.yaml b/stsci.stimage/meta.yaml
index 469c505..45e87b2 100644
--- a/stsci.stimage/meta.yaml
+++ b/stsci.stimage/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'stsci.stimage' %}
-{% set version = '0.2.1' %}
-{% set number = '2' %}
+{% set version = '0.2.2' %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/spacetelescope/{{ name }}
@@ -17,18 +17,18 @@ package:
 
 requirements:
     build:
-    - d2to1
-    - numpy {{ numpy }}
-    - stsci.distutils
-    - setuptools
-    - python {{ python }}
+      - d2to1
+      - numpy {{ numpy }}
+      - stsci.distutils
+      - setuptools
+      - python {{ python }}
     run:
-    - numpy
-    - python
+      - numpy
+      - python
 
 source:
     git_url: https://github.com/spacetelescope/{{ name }}.git
 
 test:
     imports:
-    - stsci.stimage
+      - stsci.stimage
diff --git a/synphot/meta.yaml b/synphot/meta.yaml
index 8e6874a..b08b666 100644
--- a/synphot/meta.yaml
+++ b/synphot/meta.yaml
@@ -1,7 +1,7 @@
 {% set reponame = 'synphot_refactor' %}
 {% set name = 'synphot' %}
-{% set version = '0.1' %}
-{% set number = '1' %}
+{% set version = '0.1.1' %}
+{% set number = '0' %}
 
 about:
     home: https://github.com/spacetelescope/{{ reponame }}
diff --git a/webbpsf-data/meta.yaml b/webbpsf-data/meta.yaml
index b445131..9a0e37c 100644
--- a/webbpsf-data/meta.yaml
+++ b/webbpsf-data/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = 'webbpsf-data' %}
-{% set version = '0.6.0' %}
-{% set number = '1' %}
+{% set version = '0.7.0' %}
+{% set number = '0' %}
 
 about:
     home: https://webbpsf.readthedocs.io
diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml
index ae4f237..1c0ba1e 100644
--- a/webbpsf/meta.yaml
+++ b/webbpsf/meta.yaml
@@ -1,7 +1,7 @@
 {% set name = 'webbpsf' %}
-{% set version = '0.6.0' %}
+{% set version = '0.7.0' %}
 {% set tag = 'v' + version %}
-{% set number = '1' %}
+{% set number = '0' %}
 
 about:
     home: https://webbpsf.readthedocs.io
@@ -19,29 +19,31 @@ package:
 
 requirements:
     build:
-    - astropy >=1.1
+    - astropy >=1.2
     - numpy {{ numpy }}
-    - scipy
-    - matplotlib
-    - poppy >=0.6.1
-    - six [py27]
-    - webbpsf-data ==0.6.0
+    - scipy >=0.16.0
+    - matplotlib >=1.5.0
+    - poppy >=0.7.0
+    - six
+    - webbpsf-data ==0.7.0
     - setuptools
     - python {{ python }}
     - ipywidgets
     - jwxml
+    - pysiaf >=0.1.8
     run:
-    - astropy >=1.1
-    - numpy
-    - scipy
-    - matplotlib
-    - poppy >=0.6.1
-    - six [py27]
+    - astropy >=1.2
+    - numpy {{numpy}}
+    - scipy >=0.16.0
+    - matplotlib >=1.5.0
+    - poppy >=0.7.0
+    - six
     - webbpsf-data ==0.6.0
     - setuptools
     - python
     - ipywidgets
     - jwxml
+    - pysiaf >=0.1.8
 
 source:
     git_tag: {{ tag }}