Update to version 0.15.0

2 files changed, 24 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a11fcdd8267..f76b7916b74e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-sphinx-automodapi
 	pkgdesc = Sphinx extension for generating API documentation.
-	pkgver = 0.14.1
+	pkgver = 0.15.0
 	pkgrel = 1
 	url = https://sphinx-automodapi.readthedocs.io
 	arch = any
@@ -8,10 +8,13 @@ pkgbase = python-sphinx-automodapi
 	checkdepends = python-pytest
 	checkdepends = graphviz
 	makedepends = python-setuptools-scm
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-sphinx
 	makedepends = python-sphinx_rtd_theme
-	source = https://files.pythonhosted.org/packages/source/s/sphinx-automodapi/sphinx-automodapi-0.14.1.tar.gz
-	sha256sums = a2f9c0f9e2901875e6db75df6c01412875eb15f25e7db1206e1b69fedf75bbc9
+	source = https://files.pythonhosted.org/packages/source/s/sphinx-automodapi/sphinx-automodapi-0.15.0.tar.gz
+	sha256sums = fd5871e054df7f3e299dde959afffa849f4d01c6eac274c366b06472afcb06aa
 
 pkgname = python-sphinx-automodapi
 	depends = python-sphinx>=2
diff --git a/PKGBUILD b/PKGBUILD
index 6334676accb7..01cc73622fac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,41 @@
 pkgbase=python-sphinx-automodapi
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.14.1
+pkgver=0.15.0
 pkgrel=1
 pkgdesc="Sphinx extension for generating API documentation."
 arch=('any')
 url="https://sphinx-automodapi.readthedocs.io"
 license=('BSD')
-makedepends=('python-setuptools-scm' 'python-sphinx' 'python-sphinx_rtd_theme')
-checkdepends=('python-pytest' 'graphviz')
+makedepends=('python-setuptools-scm'
+             'python-wheel'
+             'python-build'
+             'python-installer'
+             'python-sphinx'
+             'python-sphinx_rtd_theme')
+checkdepends=('python-pytest' 'graphviz') # sphinx already in makedepends
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-sha256sums=('a2f9c0f9e2901875e6db75df6c01412875eb15f25e7db1206e1b69fedf75bbc9')
+sha256sums=('fd5871e054df7f3e299dde959afffa849f4d01c6eac274c366b06472afcb06aa')
 
-prepare() {
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+get_pyver() {
+    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
 }
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
-    python setup.py build_sphinx
+    PYTHONPATH="../build/lib" make -C docs html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    #export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
     #ln -rs ${srcdir}/${_pyname}-${pkgver}/${_pyname/-/_}*egg-info \
-    #    build/lib/${_pyname/-/_}-${pkgver}-py${_pyver}.egg-info
-    PYTHONPATH="build/lib" pytest ${_pyname/-/_} || warning "Tests failed"
+    #    build/lib/${_pyname/-/_}-${pkgver}-py$(get_pyver .).egg-info
+    #PYTHONPATH="build/lib" pytest ${_pyname/-/_} || warning "Tests failed"
+    pytest || warning "Tests failed" # -vv --color=yes
 }
 
 package_python-sphinx-automodapi() {
@@ -42,12 +47,12 @@ package_python-sphinx-automodapi() {
 
     install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 package_python-sphinx-automodapi-doc() {
     pkgdesc="Documentation for sphinx-automodapi"
-    cd ${srcdir}/${_pyname}-${pkgver}/build/sphinx
+    cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE.rst
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"