Update to version 3.5.1

2 files changed, 49 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6c1141a2437..40768d2140ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-drizzlepac
 	pkgdesc = AstroDrizzle for HST images
-	pkgver = 3.5.0
+	pkgver = 3.5.1
 	pkgrel = 1
 	url = http://www.stsci.edu/scientific-community/software/drizzlepac.html
 	arch = i686
@@ -26,12 +26,11 @@ pkgbase = python-drizzlepac
 	makedepends = python-wheel
 	makedepends = python-build
 	makedepends = python-installer
-	makedepends = python-numpy
 	makedepends = python-astropy>=5.0.4
 	makedepends = python-markupsafe
-	source = https://files.pythonhosted.org/packages/source/d/drizzlepac/drizzlepac-3.5.0.tar.gz
+	source = https://files.pythonhosted.org/packages/source/d/drizzlepac/drizzlepac-3.5.1.tar.gz
 	source = https://raw.githubusercontent.com/spacetelescope/drizzlepac/master/tests/hap/ACSWFC3ListDefault50.csv
-	md5sums = c8b4f55f306bc9453fb3e71c46fd1d34
+	md5sums = 76fa6ef47c3cacf91b98c451c415687f
 	md5sums = acaf7d8bcf0f6244042bba0df3d03679
 
 pkgname = python-drizzlepac
@@ -47,18 +46,19 @@ pkgname = python-drizzlepac
 	depends = python-stsci.stimage
 	depends = python-stwcs>=1.5.3
 	depends = python-tweakwcs>=0.8.0
-	depends = python-stregion
+	depends = python-stregion>=1.1.7
 	depends = python-fitsblender>=0.4.2
-	optdepends = python-astroquery>=0.4: HAP-pipeline specific
-	optdepends = python-photutils>1.2.0: HAP-pipeline specific
-	optdepends = python-bokeh: HAP-pipeline specific
-	optdepends = python-pandas: HAP-pipeline specific
-	optdepends = python-spherical_geometry>=1.2.22: HAP-pipeline specific
-	optdepends = python-pypdf2: HAP-pipeline specific
-	optdepends = python-pytables: HAP-pipeline specific
+	depends = python-bokeh
+	depends = python-pandas
+	depends = python-spherical_geometry>=1.2.22
+	depends = python-astroquery>=0.4
+	depends = python-photutils>1.5.0
+	depends = python-lxml
+	depends = python-pypdf2
+	depends = python-scikit-image>=0.14.2
+	depends = python-pytables
+	depends = python-typing_extensions>4
+	depends = python-markupsafe
 	optdepends = python-yaml: HAP-pipeline specific
 	optdepends = python-pysynphot
-	optdepends = python-lxml: HAP-pipeline specific
-	optdepends = python-scikit-image
-	optdepends = python-markupsafe<=2.0.1
 	optdepends = python-drizzlepac-doc: Documentation for DrizzlePac
diff --git a/PKGBUILD b/PKGBUILD
index 0215d8c8b8e9..8865b5667712 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgbase=python-drizzlepac
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}")
 #"python-${_pyname}-doc")
-pkgver=3.5.0
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="AstroDrizzle for HST images"
 arch=('i686' 'x86_64')
@@ -13,7 +13,6 @@ makedepends=('python-setuptools-scm>=3.4'
              'python-wheel'
              'python-build'
              'python-installer'
-             'python-numpy'
              'python-astropy>=5.0.4'
              'python-markupsafe')
 #            'python-relic'
@@ -54,17 +53,19 @@ checkdepends=('python-pytest'
 #              'python-crds'
 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")
-md5sums=('c8b4f55f306bc9453fb3e71c46fd1d34'
+md5sums=('76fa6ef47c3cacf91b98c451c415687f'
          'acaf7d8bcf0f6244042bba0df3d03679')
 
-get_pyver() {
-    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
+get_pyinfo() {
+     [[ $1 == "site" ]] && python -c "import site; print(site.getsitepackages()[0])" || \
+             python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
 }
 
+
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    sed -i "/markupsafe/s/<=2.0.1//" pyproject.toml
+    sed -i -e "/markupsafe/s/<=2.0.1//" -e '/"astropy/s/>=5.0.4//' pyproject.toml
 }
 
 build() {
@@ -78,19 +79,19 @@ build() {
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    ln -rs ${srcdir}/ACSWFC3ListDefault50.csv "build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap"
+#   ln -rs ${srcdir}/ACSWFC3ListDefault50.csv "build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap"
     # skip some tests that need lots of online data or cost lots of time; some files are missing in pypi package
-    pytest "build/lib.linux-${CARCH}-cpython-$(get_pyver)" \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_run_svmpoller.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_canary.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_hrcsbc.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_ibqk07.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_ibyt50.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_j97e06.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_je281u.py \
-        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_svm_wfc3ir.py \
-        --deselect=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_pipeline.py::TestSingleton::test_astrometric_singleton[iaaua1n4q] \
-        --deselect=build/lib.linux-${CARCH}-cpython-$(get_pyver)/tests/hap/test_pipeline.py::TestSingleton::test_astrometric_singleton[iacs01t4q] || warning "Tests failed" # -vv --color=yes
+    pytest "build/lib.linux-${CARCH}-cpython-$(get_pyinfo)" \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_run_svmpoller.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_canary.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_hrcsbc.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_ibqk07.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_ibyt50.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_j97e06.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_je281u.py \
+        --ignore=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_svm_wfc3ir.py \
+        --deselect=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_pipeline.py::TestSingleton::test_astrometric_singleton[iaaua1n4q] \
+        --deselect=build/lib.linux-${CARCH}-cpython-$(get_pyinfo)/tests/hap/test_pipeline.py::TestSingleton::test_astrometric_singleton[iacs01t4q] || warning "Tests failed" # -vv --color=yes
 }
 
 package_python-drizzlepac() {
@@ -106,29 +107,30 @@ package_python-drizzlepac() {
              'python-stsci.stimage'
              'python-stwcs>=1.5.3'
              'python-tweakwcs>=0.8.0'
-             'python-stregion'
-             'python-fitsblender>=0.4.2')
+             'python-stregion>=1.1.7'
+             'python-fitsblender>=0.4.2'
+             'python-bokeh'
+             'python-pandas'
+             'python-spherical_geometry>=1.2.22'
+             'python-astroquery>=0.4'
+             'python-photutils>1.5.0'
+             'python-lxml'
+             'python-pypdf2'
+             'python-scikit-image>=0.14.2'
+             'python-pytables'
+             'python-typing_extensions>4'
+             'python-markupsafe')
 #            'python-acstools'
 #            'python-nictools')
-    optdepends=('python-astroquery>=0.4: HAP-pipeline specific'
-                'python-photutils>1.2.0: HAP-pipeline specific'
-                'python-bokeh: HAP-pipeline specific'
-                'python-pandas: HAP-pipeline specific'
-                'python-spherical_geometry>=1.2.22: HAP-pipeline specific'
-                'python-pypdf2: HAP-pipeline specific'
-                'python-pytables: HAP-pipeline specific'
-                'python-yaml: HAP-pipeline specific'
+    optdepends=('python-yaml: HAP-pipeline specific'
                 'python-pysynphot'
-                'python-lxml: HAP-pipeline specific'
-                'python-scikit-image'
-                'python-markupsafe<=2.0.1'
                 'python-drizzlepac-doc: Documentation for DrizzlePac')
     cd ${srcdir}/${_pyname}-${pkgver}
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.txt
     install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
     python -m installer --destdir="${pkgdir}" dist/*.whl
-    rm -r "${pkgdir}/usr/lib/python$(get_pyver .)/site-packages/tests"
+    rm -r ${pkgdir}/$(get_pyinfo site)/{doc,src,tests}
 #   rm "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/tests/__init__.py"
 #   rm "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/tests/__pycache__"/__init__*
 }