diff --git a/testing/py3-utils/APKBUILD b/testing/py3-utils/APKBUILD index 0673c76d55a..4740a2d6989 100644 --- a/testing/py3-utils/APKBUILD +++ b/testing/py3-utils/APKBUILD @@ -2,18 +2,19 @@ # Maintainer: Marian Buschsieweke pkgname=py3-utils _pkgname=python-utils -pkgver=3.7.0 +pkgver=3.8.1 pkgrel=0 pkgdesc="Convenient utilities not included with the standard Python install" url="https://github.com/WoLpH/python-utils" -arch="noarch !s390x" # fails tests +arch="noarch" license="BSD-3-Clause" -makedepends="py3-setuptools" +makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest py3-pytest-asyncio py3-loguru" subpackages="$pkgname-pyc" source=" https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz + fix-setuptools-deprecation.patch pytest.patch typing-ext.patch " @@ -21,19 +22,25 @@ source=" builddir="$srcdir/$_pkgname-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } sha512sums=" -df3b33dbf213c7099a5a17166ac1e01e9044bf6bb364de96a4b182831ff3216fe37edb7f94cb66f8d2fcab42cea404a9c4f27142890ae0e7510363815f47ad41 python-utils-3.7.0.tar.gz +ccba9651cc99a8f4e3f13e7ff66a43a40d2e85bc735b6246524269495ff321225a0dcad9abd03ca9cb61b4b1b35a27009fac3fe87e3f748ffc5c87a956acd335 python-utils-3.8.1.tar.gz +c001453b958b8231806ef6a04fcd21e1d252eeec36d4e6cbfce35f0662bae76c3f7484e0e8ff06d68a3e9cc7d19c9cdbf792c13e0101c580bb5e8de9d837fde7 fix-setuptools-deprecation.patch 99cc91ad155f8140aedc9420659c0e560a4d816ac1f85468ddb3a9fdc87526d591da916441d63b601146a86fb2c26f61c9dfbe37e31b86ee605f732e24e7b465 pytest.patch -fad358e2082683987d209abb704e4a6e1b8d67bcc00aaf08e5b7f94d11f823326cfcd8f3d5d5383e3984e324664e4f545e4066238937712aab36c768abc29152 typing-ext.patch +d68943e3301eaafe2a9ea27f382a2eba1ce98149d8cbbe91aa9222cf76a8f7bebba3d9dbfced54bd88c90688a6e18373f011fbb83cd36cbf2ecd3e36b034aa22 typing-ext.patch " diff --git a/testing/py3-utils/fix-setuptools-deprecation.patch b/testing/py3-utils/fix-setuptools-deprecation.patch new file mode 100644 index 00000000000..16b5e5a1b8a --- /dev/null +++ b/testing/py3-utils/fix-setuptools-deprecation.patch @@ -0,0 +1,11 @@ +--- a/setup.cfg ++++ b/setup.cfg +@@ -2,7 +2,7 @@ + test = pytest + + [metadata] +-description-file = README.rst ++description_file = README.rst + + [nosetests] + verbosity = 3 diff --git a/testing/py3-utils/typing-ext.patch b/testing/py3-utils/typing-ext.patch index 6d197716a8a..ee6acb2f2ee 100644 --- a/testing/py3-utils/typing-ext.patch +++ b/testing/py3-utils/typing-ext.patch @@ -10,3 +10,13 @@ index 01c319a..79ef950 100644 from typing import * # type: ignore # pragma: no cover # noqa: F403 from types import * # type: ignore # pragma: no cover # noqa: F403 +--- a/setup.py ++++ b/setup.py +@@ -29,7 +29,6 @@ + ), + package_data={'python_utils': ['py.typed']}, + long_description=long_description, +- install_requires=['typing_extensions>3.10.0.2'], + tests_require=['pytest'], + extras_require={ + 'loguru': [