From de08afd874c7e7fcdf62eaadca1c652d76f423ac Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Mon, 20 Feb 2023 13:40:39 +0100
Subject: [PATCH] testing/py3-solidpython: upgrade to 1.1.2

---
 testing/py3-solidpython/APKBUILD           | 44 +++++++++++++++-------
 testing/py3-solidpython/fix-versions.patch | 32 ----------------
 testing/py3-solidpython/poetry-core.patch  | 11 ++++++
 3 files changed, 41 insertions(+), 46 deletions(-)
 delete mode 100644 testing/py3-solidpython/fix-versions.patch
 create mode 100644 testing/py3-solidpython/poetry-core.patch

diff --git a/testing/py3-solidpython/APKBUILD b/testing/py3-solidpython/APKBUILD
index 093d4eeed28..1d8c5e1b461 100644
--- a/testing/py3-solidpython/APKBUILD
+++ b/testing/py3-solidpython/APKBUILD
@@ -1,44 +1,60 @@
 # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
 pkgname=py3-solidpython
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.1.2
+pkgrel=0
 pkgdesc="Python library to generated OpenSCAD code"
 url="https://github.com/SolidCode/SolidPython"
 arch="noarch !aarch64 !armv7 !armhf" # openscad
 license="LGPL-2.1-or-later"
 depends="
 	openscad
+	py3-astroid
 	py3-euclid3<0.2.0
+	py3-mccabe
+	py3-platformdirs
+	py3-ply
 	py3-prettytable
 	py3-pypng
 	py3-regex
+	py3-setuptools
+	py3-tomlkit
 	python3
 	"
 makedepends="
-	py3-setuptools
+	py3-gpep517
+	py3-poetry-core
 	"
 _pyname="solidpython"
-_pypiprefix="${_pyname%${_pyname#?}}"
+_pypiprefix="${_pyname%"${_pyname#?}"}"
 source="
 	https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz
-	fix-versions.patch
+	poetry-core.patch
 	"
 builddir="$srcdir/$_pyname-$pkgver"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	# Run the loop ourselves instead of relying on bash
-	local i; for i in solid/test/test_*.py; do
-		echo "$i"
-		PYTHONPATH="$PWD/build/lib" python3 "$i"
-	done
+	python3 -m venv --clear --without-pip --system-site-packages testenv
+	testenv/bin/python3 -m installer dist/*.whl
+	testenv/bin/python3 -m unittest discover solid/test
+	# local i; for i in solid/test/test_*.py; do
+	# 	echo "$i"
+	# 	python3 "$i"
+	# done
 }
 
 package() {
-	python3 setup.py install --skip-build --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		dist/*.whl
+	rm -r "$pkgdir"/usr/lib/python3*/site-packages/solid/test
 }
-sha512sums="eeb7c68e54055fcfd5b53cf9c2745ea4dac602dbce158c8c7559dde21372c87cacbcac9c203cf0b577bd292a59304d48e8a4c7afcf9afdd9cc6c6cf0286e1d09  solidpython-1.0.2.tar.gz
-41e71d68ba0381ea44ab206a95549558991e923a218d4a8d7730a8baa21922762d0d3555a61e5d81bfb39d1918627deb1f17fa2347d279a3cf9b14cbf8270ae4  fix-versions.patch"
+
+sha512sums="
+b66b530fc1abc9c8c3044ad0bb74f7dab2932c77e6374a1e46573f934c2d59af9c24dae86e54201dec7ebae4d3e0dbfa2c2733fa18394a9ce87d5fd562544dc0  solidpython-1.1.2.tar.gz
+df25c55af2d6dc6744b344deab129b5128c60d3c768f92018cbf7ceeca06f414fe427c231045ca8f0586a6f2bfbd598f8c2964492bf5def620f4a38ba5d84c96  poetry-core.patch
+"
diff --git a/testing/py3-solidpython/fix-versions.patch b/testing/py3-solidpython/fix-versions.patch
deleted file mode 100644
index 43da9ba87a7..00000000000
--- a/testing/py3-solidpython/fix-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream: No
-Reason: allow more liberal versions to be used
-
---- solidpython-1.0.2.orig/PKG-INFO
-+++ solidpython-1.0.2/PKG-INFO
-@@ -21,8 +21,8 @@
- Classifier: Topic :: Scientific/Engineering :: Mathematics
- Classifier: Topic :: Software Development :: Libraries :: Python Modules
- Requires-Dist: PrettyTable (==0.7.2)
--Requires-Dist: euclid3 (>=0.1.0,<0.2.0)
--Requires-Dist: pypng (>=0.0.19,<0.0.20)
--Requires-Dist: regex (>=2019.4,<2020.0)
-+Requires-Dist: euclid3 (>=0.1.0)
-+Requires-Dist: pypng (>=0.0.19)
-+Requires-Dist: regex (>=2019.4)
- Project-URL: Documentation, https://solidpython.readthedocs.io/en/latest/
- Project-URL: Repository, https://github.com/SolidCode/SolidPython
---- solidpython-1.0.2.orig/setup.py
-+++ solidpython-1.0.2/setup.py
-@@ -13,9 +13,9 @@
- 
- install_requires = \
- ['PrettyTable==0.7.2',
-- 'euclid3>=0.1.0,<0.2.0',
-- 'pypng>=0.0.19,<0.0.20',
-- 'regex>=2019.4,<2020.0']
-+ 'euclid3>=0.1.0',
-+ 'pypng>=0.0.19',
-+ 'regex>=2019.4']
- 
- setup_kwargs = {
-     'name': 'solidpython',
diff --git a/testing/py3-solidpython/poetry-core.patch b/testing/py3-solidpython/poetry-core.patch
new file mode 100644
index 00000000000..bfb6010ead8
--- /dev/null
+++ b/testing/py3-solidpython/poetry-core.patch
@@ -0,0 +1,11 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index e29373a..3ce3993 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -56,5 +56,5 @@ requires = [
+ 
+ ]
+ 
+-build-backend = "poetry.masonry.api"
++build-backend = "poetry.core.masonry.api"
+