Upgrade to 1.1.1 and drop python2

3 files changed, 39 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eda7805b6a96..7efe36a88bd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,23 @@
-# Generated by mksrcinfo v8
-# Thu Apr 13 09:16:34 UTC 2017
 pkgbase = python-doc8
 	pkgdesc = Style checker for Sphinx (or other) RST documentation
-	pkgver = 0.8.0
+	pkgver = 1.1.1
 	pkgrel = 1
 	url = https://pypi.python.org/pypi/doc8
 	arch = any
 	license = Apache 2.0
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://files.pythonhosted.org/packages/source/d/doc8/doc8-0.8.0.tar.gz
-	sha256sums = 2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543
-
-pkgname = python-doc8
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	makedepends = python-setuptools-scm>=7
 	depends = python-stevedore
 	depends = python-chardet
 	depends = python-docutils
 	depends = python-argparse
 	depends = python-six
 	depends = python-restructuredtext_lint
+	source = https://files.pythonhosted.org/packages/source/d/doc8/doc8-1.1.1.tar.gz
+	source = scm.patch
+	sha256sums = d97a93e8f5a2efc4713a0804657dedad83745cca4cd1d88de9186f77f9776004
+	sha256sums = fa5dad03044736139ba64ad72d6157e414a00124b4e4ec277dcb6d2a655935c3
 
-pkgname = python2-doc8
-	depends = python2-stevedore
-	depends = python2-chardet
-	depends = python2-docutils
-	depends = python2-argparse
-	depends = python2-six
-	depends = python2-restructuredtext_lint
-
+pkgname = python-doc8
diff --git a/PKGBUILD b/PKGBUILD
index dfbba4900dd0..5e388af75924 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,31 @@
-pkgbase=python-doc8
-pkgname=(python-doc8 python2-doc8)
+pkgname=python-doc8
 _pyname=doc8
-pkgver=0.8.0
+pkgver=1.1.1
 pkgrel=1
 arch=(any)
 pkgdesc="Style checker for Sphinx (or other) RST documentation"
 url='https://pypi.python.org/pypi/doc8'
 license=('Apache 2.0')
-makedepends=(python-setuptools python2-setuptools)
-source=("https://files.pythonhosted.org/packages/source/d/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+depends=('python-stevedore' 'python-chardet' 'python-docutils' 'python-argparse' 'python-six' 'python-restructuredtext_lint')
+makedepends=(python-build python-installer python-wheel 'python-setuptools-scm>=7')
+source=("https://files.pythonhosted.org/packages/source/d/${_pyname}/${_pyname}-${pkgver}.tar.gz" "scm.patch")
 
-build() {
-  cp -r $_pyname-$pkgver $_pyname-$pkgver-py2
-
-  cd $_pyname-$pkgver
-  python setup.py build
-
-  cd "$srcdir"/$_pyname-$pkgver-py2
-  python2 setup.py build
+prepare() {
+  cd "$srcdir/$_pyname-$pkgver"
+  patch -p1 -i $srcdir/scm.patch
 }
 
-package_python-doc8() {
-  depends=('python-stevedore' 'python-chardet' 'python-docutils' 'python-argparse' 'python-six' 'python-restructuredtext_lint')
-  cd $_pyname-${pkgver}
-  python setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+build() {
+  cd "$srcdir/$_pyname-$pkgver"
+  python -m build --wheel --no-isolation
 }
 
-package_python2-doc8() {
-  depends=('python2-stevedore' 'python2-chardet' 'python2-docutils' 'python2-argparse' 'python2-six' 'python2-restructuredtext_lint')
-  cd $_pyname-${pkgver}-py2 
-  python2 setup.py install --root="$pkgdir" --optimize=1
+package() {
+  cd "$srcdir/$_pyname-$pkgver"
+  python -m installer --destdir="$pkgdir" dist/*.whl
 
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha256sums=('2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543')
+sha256sums=('d97a93e8f5a2efc4713a0804657dedad83745cca4cd1d88de9186f77f9776004'
+            'fa5dad03044736139ba64ad72d6157e414a00124b4e4ec277dcb6d2a655935c3')
diff --git a/scm.patch b/scm.patch
new file mode 100644
index 000000000000..3365547f92b5
--- /dev/null
+++ b/scm.patch
@@ -0,0 +1,13 @@
+diff -ruN doc8-1.1.1.orig/pyproject.toml doc8-1.1.1/pyproject.toml
+--- doc8-1.1.1.orig/pyproject.toml	2023-02-28 10:09:02.259306066 +0100
++++ doc8-1.1.1/pyproject.toml	2023-02-28 10:09:45.852847982 +0100
+@@ -1,8 +1,7 @@
+ [build-system]
+ requires = [
+   "setuptools>=61.2",
+-  "setuptools_scm[toml] >= 3.5.0",
+-  "setuptools_scm_git_archive >= 1.1",
++  "setuptools_scm[toml] >= 7.0.0",
+   "wheel >= 0.33.6",
+ ]
+ build-backend = "setuptools.build_meta"