Update to version 4.14.1

2 files changed, 36 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 015254d876f4..fb2cedabeb88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,26 @@
 pkgbase = python-sherpa
 	pkgdesc = Modeling and fitting package for scientific data analysis
-	pkgver = 4.14.0
+	pkgver = 4.14.1
 	pkgrel = 1
-	url = http://cxc.cfa.harvard.edu/contrib/sherpa/
+	url = http://cxc.cfa.harvard.edu/contrib/sherpa
 	arch = i686
 	arch = x86_64
 	license = GPL
 	checkdepends = python-pytest-xvfb
+	makedepends = python-setuptools
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-numpy
 	makedepends = fftw
-	makedepends = python-setuptools
 	makedepends = python-sphinx_rtd_theme
 	makedepends = python-sphinx-astropy
 	makedepends = graphviz
 	makedepends = python-nbsphinx>=0.8.6
 	makedepends = pandoc
-	source = https://files.pythonhosted.org/packages/source/s/sherpa/sherpa-4.14.0.tar.gz
+	source = https://files.pythonhosted.org/packages/source/s/sherpa/sherpa-4.14.1.tar.gz
 	source = sherpa_local_fftw.patch
-	md5sums = 05674dfa5a616a34acac02c4d336f0c1
+	md5sums = 693dd73517c2943e2477c4d36a75f1a4
 	md5sums = d1823cc7683442d92450fadff7aed362
 
 pkgname = python-sherpa
@@ -29,9 +32,6 @@ pkgname = python-sherpa
 	optdepends = python-astropy>=3.2.1: Data I/O support
 	optdepends = ds9: Imaging requires
 	optdepends = xpa: Imaging requires
-	optdepends = python-pytest>=3.3: For testing suite
-	optdepends = python-mock: For testing suite
-	optdepends = python-pytest-xvfb: For testing suite
 	optdepends = python-sherpa-doc: Documentation for Sherpa
 
 pkgname = python-sherpa-doc
diff --git a/PKGBUILD b/PKGBUILD
index 54d8b6a32006..cd45a21de367 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,57 @@
 pkgbase=python-sherpa
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=4.14.0
+pkgver=4.14.1
 pkgrel=1
 pkgdesc="Modeling and fitting package for scientific data analysis"
 arch=('i686' 'x86_64')
-url="http://cxc.cfa.harvard.edu/contrib/sherpa/"
+url="http://cxc.cfa.harvard.edu/contrib/sherpa"
 license=('GPL')
-makedepends=('python-numpy' 'fftw' 'python-setuptools' 'python-sphinx_rtd_theme' 'python-sphinx-astropy' 'graphviz' 'python-nbsphinx>=0.8.6' 'pandoc')
+makedepends=('python-setuptools'
+             'python-wheel'
+             'python-build'
+             'python-installer'
+             'python-numpy'
+             'fftw'
+             'python-sphinx_rtd_theme'
+             'python-sphinx-astropy'
+             'graphviz'
+             'python-nbsphinx>=0.8.6'
+             'pandoc')
 #'gcc-fortran')
 checkdepends=('python-pytest-xvfb')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
         'sherpa_local_fftw.patch')
-md5sums=('05674dfa5a616a34acac02c4d336f0c1'
+md5sums=('693dd73517c2943e2477c4d36a75f1a4'
          'd1823cc7683442d92450fadff7aed362')
 
+get_pyver() {
+    python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))'
+}
+
 prepare() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
     patch -Np1 -i "${srcdir}/sherpa_local_fftw.patch"
-    sed -e '/'\'nbsphinx\''/a \    '\'IPython\.sphinxext\.ipython_console_highlighting\','' \
-        -e '/'\'nbsphinx\''/s/$/,/' -i docs/conf.py
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+    sed -i -e "/oldest-supported-numpy/d" -e "/setuptools/s/ < 60//" pyproject.toml
+#   sed -e '/'\'nbsphinx\''/a \    '\'IPython\.sphinxext\.ipython_console_highlighting\','' \
+#       -i docs/conf.py
 }
 
 build() {
 #   unset LDFLAGS
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
-    python setup.py build_sphinx
+    cd ${srcdir}/${_pyname}-${pkgver}/docs
+    PYTHONPATH="../build/lib" make html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    pytest "build/lib.linux-${CARCH}-${_pyver}" || warning "Tests failed"
+    pytest "build/lib.linux-${CARCH}-$(get_pyver)" || warning "Tests failed"
 }
 
 package_python-sherpa() {
@@ -46,9 +61,6 @@ package_python-sherpa() {
                 'python-astropy>=3.2.1: Data I/O support'
                 'ds9: Imaging requires'
                 'xpa: Imaging requires'
-                'python-pytest>=3.3: For testing suite'
-                'python-mock: For testing suite'
-                'python-pytest-xvfb: For testing suite'
                 'python-sherpa-doc: Documentation for Sherpa')
     install=python-sherpa.install
     cd ${srcdir}/${_pyname}-${pkgver}
@@ -56,13 +68,13 @@ package_python-sherpa() {
     install -D -m644 {README.md,CITATION} -t "${pkgdir}/usr/share/doc/${pkgname}"
     install -D -m644 notebooks/SherpaQuickStart.ipynb -t "${pkgdir}/usr/share/doc/${pkgname}/notebooks"
     install -D -m644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-    rm ${pkgdir}/usr/lib/python${_pyver}/site-packages/sherpa-${pkgver}-py${_pyver}.egg-info/SOURCES.txt
+    python -m installer --destdir="${pkgdir}" dist/*.whl
+#   rm ${pkgdir}/usr/lib/python$(get_pyver)/site-packages/sherpa-${pkgver}-py$(get_pyver).egg-info/SOURCES.txt
 }
 
 package_python-sherpa-doc() {
     pkgdesc="Documentation for Sherpa"
-    cd ${srcdir}/${_pyname}-${pkgver}/build/sphinx
+    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
     cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"