Update to version 3.2.0

3 files changed, 56 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 138ab97fb8a1..3a49e4d0a1e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 pkgbase = python-drizzlepac
 	pkgdesc = AstroDrizzle for HST images
-	pkgver = 3.1.8
+	pkgver = 3.2.0
 	pkgrel = 1
 	url = http://www.stsci.edu/scientific-community/software/drizzlepac.html
 	arch = i686
 	arch = x86_64
 	license = BSD
-	checkdepends = python-pytest
-	checkdepends = python-stsci.skypac
-	checkdepends = python-ci_watson
-	checkdepends = python-fitsblender
 	makedepends = python-setuptools
 	makedepends = python-relic
 	makedepends = python-astropy
-	source = https://files.pythonhosted.org/packages/source/d/drizzlepac/drizzlepac-3.1.8.tar.gz
+	source = https://files.pythonhosted.org/packages/source/d/drizzlepac/drizzlepac-3.2.0.tar.gz
 	source = https://raw.githubusercontent.com/spacetelescope/drizzlepac/master/LICENSE.txt
-	md5sums = 44e4658c3af5e1cac72608e4625434e6
+	md5sums = b0e93c3e3f3c7f90f83e869edf38457e
 	md5sums = SKIP
 
 pkgname = python-drizzlepac
-	depends = python>=3.5
+	depends = python>=3.6
 	depends = python-nose
+	depends = python-scipy
 	depends = python-matplotlib
 	depends = python-requests
 	depends = python-scikit-learn>=0.20
@@ -36,10 +33,15 @@ pkgname = python-drizzlepac
 	depends = python-fitsblender
 	depends = python-acstools
 	depends = python-nictools
-	depends = python-astroquery
-	depends = python-photutils>=0.7
-	depends = python-pysynphot
-	depends = python-lxml
-	depends = python-scikit-image>=0.14.2
+	optdepends = python-astroquery>=0.4: HAP-pipeline specific
+	optdepends = python-photutils>=0.7: HAP-pipeline specific
+	optdepends = python-bokeh: HAP-pipeline specific
+	optdepends = python-pandas: HAP-pipeline specific
+	optdepends = python-pypdf2: HAP-pipeline specific
+	optdepends = python-pytables: HAP-pipeline specific
+	optdepends = python-yaml: HAP-pipeline specific
+	optdepends = python-pysynphot
+	optdepends = python-lxml: HAP-pipeline specific
+	optdepends = python-scikit-image>=0.14.2
 	optdepends = python-drizzlepac-doc: Documentation for DrizzlePac
 
diff --git a/.gitignore b/.gitignore
index e896dcd6056d..6ea35519e4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ pkg
 *.tar.bz2
 *.part
 *.pkg.tar.*
+LICENSE*
+*.csv
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index 3b7445af10b4..d091aeaad388 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgbase=python-drizzlepac
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}")
 #"python-${_pyname}-doc")
-pkgver=3.1.8
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="AstroDrizzle for HST images"
 arch=('i686' 'x86_64')
@@ -27,14 +27,26 @@ makedepends=('python-setuptools'
 #            'python-stregion'
 #            'python-fitsblender'
 #            'python-nictools')
-#checkdepends=('python-pytest-remotedata' 'python-nose' 'python-ci_watson' 'python-crds')
-checkdepends=('python-pytest'
-              'python-stsci.skypac'
-              'python-ci_watson'
-              'python-fitsblender')
+#checkdepends=('python-pytest'
+#              'python-matplotlib'
+#              'python-scikit-learn'
+#              'python-stsci.skypac'
+#              'python-ci_watson'
+#              'python-fitsblender'
+#              'python-nictools'
+#              'python-stsci.image'
+#              'python-stregion'
+#              'python-tweakwcs'
+#              'python-astroquery'
+#              'python-photutils'
+#              'python-pandas'
+#              'python-bokeh'
+#              'python-pypdf2')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
+#       "https://raw.githubusercontent.com/spacetelescope/drizzlepac/master/tests/hap/ACSWFC3ListDefault50.csv"
         "https://raw.githubusercontent.com/spacetelescope/drizzlepac/master/LICENSE.txt")
-md5sums=('44e4658c3af5e1cac72608e4625434e6'
+md5sums=('b0e93c3e3f3c7f90f83e869edf38457e'
+#        'SKIP'
          'SKIP')
 
 prepare() {
@@ -52,15 +64,17 @@ build() {
 #   python setup.py build_sphinx
 }
 
-check() {
-    cd ${srcdir}/${_pyname}-${pkgver}
-
-    pytest || warning "Tests failed"
-}
+#check() {
+#    cd ${srcdir}/${_pyname}-${pkgver}/build/lib.linux-${CARCH}-${_pyver}
+#
+#    ln -rs ${srcdir}/ACSWFC3ListDefault50.csv tests/hap
+#    pytest || warning "Tests failed"
+#}
 
 package_python-drizzlepac() {
-    depends=('python>=3.5'
+    depends=('python>=3.6'
              'python-nose'
+             'python-scipy'
              'python-matplotlib'
              'python-requests'
              'python-scikit-learn>=0.20'
@@ -75,13 +89,18 @@ package_python-drizzlepac() {
              'python-stregion'
              'python-fitsblender'
              'python-acstools'
-             'python-nictools'
-             'python-astroquery'
-             'python-photutils>=0.7'
-             'python-pysynphot'
-             'python-lxml'
-             'python-scikit-image>=0.14.2')
-    optdepends=('python-drizzlepac-doc: Documentation for DrizzlePac')
+             'python-nictools')
+    optdepends=('python-astroquery>=0.4: HAP-pipeline specific'
+                'python-photutils>=0.7: HAP-pipeline specific'
+                'python-bokeh: HAP-pipeline specific'
+                'python-pandas: HAP-pipeline specific'
+                'python-pypdf2: HAP-pipeline specific'
+                'python-pytables: HAP-pipeline specific'
+                'python-yaml: HAP-pipeline specific'
+                'python-pysynphot'
+                'python-lxml: HAP-pipeline specific'
+                'python-scikit-image>=0.14.2'
+                'python-drizzlepac-doc: Documentation for DrizzlePac')
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.txt