From 3cd0dd883c7b694e937afd7451cd73bef4e6d1b8 Mon Sep 17 00:00:00 2001 From: psykose Date: Sat, 22 Jul 2023 12:35:47 +0000 Subject: [PATCH] main/py3-wheel: upgrade to 0.41.0 also drop the useless single index page doc, wrongly installed as py3- wheel by name.. --- main/py3-wheel/APKBUILD | 14 ++++++-------- main/py3-wheel/use-system-packaging.patch | 14 +++++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/main/py3-wheel/APKBUILD b/main/py3-wheel/APKBUILD index a74747e49c4..8e8df2614bc 100644 --- a/main/py3-wheel/APKBUILD +++ b/main/py3-wheel/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Antoine Fontaine # Maintainer: psykose pkgname=py3-wheel -_pyname=wheel -pkgver=0.40.0 -pkgrel=1 +pkgver=0.41.0 +pkgrel=0 pkgdesc="built-package format for Python" url="https://github.com/pypa/wheel" arch="noarch" @@ -14,11 +13,11 @@ makedepends=" py3-gpep517 " checkdepends="py3-pytest py3-setuptools python3-dev" -subpackages="$pkgname-pyc $pkgname-doc" +subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/w/wheel/wheel-$pkgver.tar.gz use-system-packaging.patch " -builddir="$srcdir"/$_pyname-$pkgver +builddir="$srcdir"/wheel-$pkgver options="!check" # circular with pytest prepare() { @@ -42,10 +41,9 @@ check() { package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl - install -Dm 0644 "$srcdir"/$_pyname-$pkgver/docs/index.rst "$pkgdir/usr/share/doc/py3-wheel" } sha512sums=" -211e68d927c93b9b2748bf081097d1172cf8d4863d540be72f1d6023b64042410805d4208a2c94de89a1eeb0fb32044e78f41ab58ac94498ac0c489a1eea0d23 wheel-0.40.0.tar.gz -4577b618eb901375a43452707875e46646c7e08e372a52de4304b31735827fcdf518699b890898cc29038e3caa21036d73665c3162ae7dbfc0e0d5b07df64b52 use-system-packaging.patch +2e5099f5d512dd8e2205cfefa68e9229a7713367ec367f580021eeb68fb5bc0382bd89a524aa8f0d7617eb26f5d57eaa5e0976d94d042a6ffa20738624d3bae7 wheel-0.41.0.tar.gz +3ff5bb40767039ced5073c18a5c8e069387997f0179709e93f4f90ffc41933037b61a62728702e1a45053f2575e056a8afcf0cce972f91e97a38a6dfa7aa153d use-system-packaging.patch " diff --git a/main/py3-wheel/use-system-packaging.patch b/main/py3-wheel/use-system-packaging.patch index 92d5298ab0f..c34e152c820 100644 --- a/main/py3-wheel/use-system-packaging.patch +++ b/main/py3-wheel/use-system-packaging.patch @@ -1,7 +1,7 @@ Upstream vendors packaging, use system packaging instead diff --git a/setup.py b/setup.py -index 92dfdce..10152da 100644 +index 78b124e..e5025c9 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ @@ -14,7 +14,7 @@ index 92dfdce..10152da 100644 package_data = \ {'': ['*']} diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py -index 28a9050..034ab82 100644 +index 2f93c47..78cdd90 100644 --- a/src/wheel/bdist_wheel.py +++ b/src/wheel/bdist_wheel.py @@ -20,6 +20,7 @@ from glob import iglob @@ -49,13 +49,13 @@ index b391c96..ffa1706 100644 def _nonblank(str): diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py -index d32a1fb..49cb157 100644 +index d202469..95ea27d 100644 --- a/tests/test_bdist_wheel.py +++ b/tests/test_bdist_wheel.py -@@ -11,7 +11,7 @@ from zipfile import ZipFile - import pytest - - from wheel.bdist_wheel import bdist_wheel, get_abi_tag +@@ -17,7 +17,7 @@ from wheel.bdist_wheel import ( + remove_readonly, + remove_readonly_exc, + ) -from wheel.vendored.packaging import tags +from packaging import tags from wheel.wheelfile import WheelFile