Update to version 3.0.4

3 files changed, 59 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e66d2c2a76c..a16db3bca16c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,52 +1,40 @@
 pkgbase = python-drizzlepac
 	pkgdesc = AstroDrizzle for HST images
-	pkgver = 2.2.6
-	pkgrel = 2
+	pkgver = 3.0.4
+	pkgrel = 1
 	url = http://www.stsci.edu/scientific-community/software/drizzlepac.html
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = python-setuptools
 	makedepends = python-relic
-	makedepends = python-spherical_geometry
-	makedepends = python-numpydoc
-	makedepends = python-sphinx_rtd_theme
-	makedepends = python-stsci_rtd_theme
-	makedepends = python-stsci.tools
-	makedepends = python-stsci.convolve
-	makedepends = python-stsci.image
-	makedepends = python-stsci.imagestats
-	makedepends = python-stsci.imagemanip
-	makedepends = python-stsci.ndimage
-	makedepends = python-stsci.skypac
-	makedepends = python-stsci.stimage
-	makedepends = python-stwcs
-	makedepends = python-stregion
-	makedepends = python-fitsblender
-	makedepends = python-nictools
-	source = https://files.pythonhosted.org/packages/source/d/drizzlepac/drizzlepac-2.2.6.tar.gz
+	makedepends = python-astropy
+	source = https://files.pythonhosted.org/packages/source/d/drizzlepac/drizzlepac-3.0.4.tar.gz
 	source = https://raw.githubusercontent.com/spacetelescope/drizzlepac/master/LICENSE.txt
-	md5sums = a4212f8f8d4c8aaaa69d4f20d6053fae
+	md5sums = 6f2224f9dd8dc6eaaf8d837962f6a026
 	md5sums = b45bee901c15ab7e1ac3e5e3626d535d
 
 pkgname = python-drizzlepac
 	depends = python>=3.5
 	depends = python-nose
-	depends = python-spherical_geometry
-	depends = python-stsci.tools
-	depends = python-stsci.convolve
+	depends = python-matplotlib
+	depends = python-requests
+	depends = python-spherical_geometry>=1.2.17
+	depends = python-stsci.tools>=3.6
 	depends = python-stsci.image>=2.3.0
 	depends = python-stsci.imagestats
-	depends = python-stsci.imagemanip
-	depends = python-stsci.ndimage
 	depends = python-stsci.skypac
 	depends = python-stsci.stimage
 	depends = python-stwcs
+	depends = python-tweakwcs>=0.5.0
 	depends = python-stregion
 	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-drizzlepac-doc: Documentation for DrizzlePac
 
-pkgname = python-drizzlepac-doc
-	pkgdesc = Documentation for DrizzlePac
-
diff --git a/.gitignore b/.gitignore
index ef6375f75615..0d6e3b36c63a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ pkg
 *.tar.bz2
 *.part
 *.pkg.tar.xz
-LICENSE*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index be2e8c2ca7f3..8f95ab50cb89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,36 @@
 # Maintainer: Astro Benzene <universebenzene at sina dot com>
 pkgbase=python-drizzlepac
 _pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=2.2.6
-pkgrel=2
+pkgname=("python-${_pyname}")
+#"python-${_pyname}-doc")
+pkgver=3.0.4
+pkgrel=1
 pkgdesc="AstroDrizzle for HST images"
 arch=('i686' 'x86_64')
 url="http://www.stsci.edu/scientific-community/software/drizzlepac.html"
 license=('BSD')
 makedepends=('python-setuptools'
              'python-relic'
-             'python-spherical_geometry'
-             'python-numpydoc'
-             'python-sphinx_rtd_theme'
-             'python-stsci_rtd_theme'
-             'python-stsci.tools'
-             'python-stsci.convolve'
-             'python-stsci.image'
-             'python-stsci.imagestats'
-             'python-stsci.imagemanip'
-             'python-stsci.ndimage'
-             'python-stsci.skypac'
-             'python-stsci.stimage'
-             'python-stwcs'
-             'python-stregion'
-             'python-fitsblender'
-             'python-nictools')
+             'python-astropy')
+#            'python-numpydoc'
+#            'python-sphinx_rtd_theme'
+#            'python-stsci_rtd_theme'
+#            'python-stsci.tools'
+#            'python-stsci.convolve'
+#            'python-stsci.image'
+#            'python-stsci.imagestats'
+#            'python-stsci.imagemanip'
+#            'python-stsci.ndimage'
+#            'python-stsci.skypac'
+#            'python-stsci.stimage'
+#            'python-stwcs'
+#            'python-stregion'
+#            'python-fitsblender'
+#            'python-nictools')
 #checkdepends=('python-pytest-remotedata' 'python-nose' 'python-ci_watson' 'python-crds')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
         "https://raw.githubusercontent.com/spacetelescope/drizzlepac/master/LICENSE.txt")
-md5sums=('a4212f8f8d4c8aaaa69d4f20d6053fae'
+md5sums=('6f2224f9dd8dc6eaaf8d837962f6a026'
          'b45bee901c15ab7e1ac3e5e3626d535d')
 _pyver=$(python -V | cut -c 8-10)
 
@@ -43,8 +44,8 @@ build() {
     cd ${srcdir}/${_pyname}-${pkgver}
     python setup.py build
 
-    msg "Building Docs"
-    python setup.py build_sphinx
+#   msg "Building Docs"
+#   python setup.py build_sphinx
 }
 
 #check() {
@@ -56,20 +57,25 @@ build() {
 package_python-drizzlepac() {
     depends=('python>=3.5'
              'python-nose'
-             'python-spherical_geometry'
-             'python-stsci.tools'
-             'python-stsci.convolve'
+             'python-matplotlib'
+             'python-requests'
+             'python-spherical_geometry>=1.2.17'
+             'python-stsci.tools>=3.6'
              'python-stsci.image>=2.3.0'
              'python-stsci.imagestats'
-             'python-stsci.imagemanip'
-             'python-stsci.ndimage'
              'python-stsci.skypac'
              'python-stsci.stimage'
              'python-stwcs'
+             'python-tweakwcs>=0.5.0'
              'python-stregion'
              'python-fitsblender'
-#            'python-acstools'
-             'python-nictools')
+             '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')
     cd ${srcdir}/${_pyname}-${pkgver}
 
@@ -80,10 +86,10 @@ package_python-drizzlepac() {
     rm "${pkgdir}/usr/lib/python${_pyver}/site-packages/tests/__pycache__"/__init__*
 }
 
-package_python-drizzlepac-doc() {
-    pkgdesc="Documentation for DrizzlePac"
-    cd ${srcdir}/${_pyname}-${pkgver}/build/sphinx
-
-    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
-    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
-}
+#package_python-drizzlepac-doc() {
+#    pkgdesc="Documentation for DrizzlePac"
+#    cd ${srcdir}/${_pyname}-${pkgver}/build/sphinx
+#
+#    install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
+#    cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
+#}