Update to version 3.4.0

2 files changed, 29 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4de5e7f4d15b..44176603cc59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = python-acstools
 	pkgdesc = Python Tools for ACS (Advanced Camera for Surveys) Data
-	pkgver = 3.3.1
+	pkgver = 3.4.0
 	pkgrel = 1
-	url = https://acstools.readthedocs.io/
-	arch = i686
-	arch = x86_64
+	url = https://acstools.readthedocs.io
+	arch = any
 	license = BSD
 	checkdepends = python-pytest-astropy-header
-	checkdepends = python-astropy
+	checkdepends = python-pytest-remotedata
+	checkdepends = python-stsci.tools
 	checkdepends = python-beautifulsoup4
 	checkdepends = python-requests
-	checkdepends = python-ci_watson
-	checkdepends = python-yaml
 	checkdepends = python-matplotlib
+	checkdepends = python-ci_watson
+	checkdepends = python-scikit-image>=0.11
 	makedepends = python-setuptools-scm
-	source = https://files.pythonhosted.org/packages/source/a/acstools/acstools-3.3.1.tar.gz
-	source = https://raw.githubusercontent.com/spacetelescope/acstools/master/LICENSE.md
-	md5sums = 70a60fb2076ea289cf898634c82a14c0
-	md5sums = SKIP
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
+	source = https://files.pythonhosted.org/packages/source/a/acstools/acstools-3.4.0.tar.gz
+	md5sums = e4b333be8a93bf34d88229c8cbbea9f1
 
 pkgname = python-acstools
 	depends = python>=3.6
@@ -30,4 +31,3 @@ pkgname = python-acstools
 	optdepends = python-scikit-image
 	optdepends = python-stsci.imagestats
 	optdepends = python-acstools-doc: Documentation for Python ACS Tools
-
diff --git a/PKGBUILD b/PKGBUILD
index 2b6f0fc59a3e..92e110dbd547 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,31 @@ pkgbase=python-acstools
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}")
 #"python-${_pyname}-doc")
-pkgver=3.3.1
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Python Tools for ACS (Advanced Camera for Surveys) Data"
-arch=('i686' 'x86_64')
-url="https://acstools.readthedocs.io/"
+arch=('any')
+url="https://acstools.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools-scm')
+makedepends=('python-setuptools-scm'
+             'python-wheel'
+             'python-build'
+             'python-installer')
 #'python-pandas' 'python-astropy' 'python-beautifulsoup4' 'python-sphinx-automodapi' 'python-sphinx_rtd_theme' 'python-matplotlib')
 checkdepends=('python-pytest-astropy-header'
-              'python-astropy'
+              'python-pytest-remotedata'
+              'python-stsci.tools'
               'python-beautifulsoup4'
               'python-requests'
+              'python-matplotlib'
               'python-ci_watson'
-              'python-yaml'
-              'python-matplotlib')
-source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-        "https://raw.githubusercontent.com/spacetelescope/acstools/master/LICENSE.md")
-md5sums=('70a60fb2076ea289cf898634c82a14c0'
-         'SKIP')
+              'python-scikit-image>=0.11')  # stsci.tools -> astropy
+source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+md5sums=('e4b333be8a93bf34d88229c8cbbea9f1')
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
 #   msg "Building Docs"
 #   cd ${srcdir}/${_pyname}-${pkgver}/doc
@@ -35,7 +37,7 @@ build() {
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    pytest
+    pytest -vv --remote-data || warning "Tests failed"
 }
 
 package() {
@@ -47,9 +49,9 @@ package() {
                 'python-acstools-doc: Documentation for Python ACS Tools')
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/LICENSE.md"
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.md
     install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.rst
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 #package_python-acstools-doc() {