mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 03:09:51 +03:00
main/py3-wheel: upgrade to 0.46.1
This commit is contained in:
parent
db94a16d78
commit
f7c2104140
2 changed files with 3 additions and 80 deletions
|
@ -1,7 +1,7 @@
|
||||||
# Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
|
# Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
|
||||||
# Maintainer: Peter Shkenev <santurysim@gmail.com>
|
# Maintainer: Peter Shkenev <santurysim@gmail.com>
|
||||||
pkgname=py3-wheel
|
pkgname=py3-wheel
|
||||||
pkgver=0.45.1
|
pkgver=0.46.1
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="built-package format for Python"
|
pkgdesc="built-package format for Python"
|
||||||
url="https://github.com/pypa/wheel"
|
url="https://github.com/pypa/wheel"
|
||||||
|
@ -14,9 +14,7 @@ makedepends="
|
||||||
"
|
"
|
||||||
checkdepends="py3-pytest py3-setuptools python3-dev"
|
checkdepends="py3-pytest py3-setuptools python3-dev"
|
||||||
subpackages="$pkgname-pyc"
|
subpackages="$pkgname-pyc"
|
||||||
source="https://files.pythonhosted.org/packages/source/w/wheel/wheel-$pkgver.tar.gz
|
source="https://files.pythonhosted.org/packages/source/w/wheel/wheel-$pkgver.tar.gz"
|
||||||
use-system-packaging.patch
|
|
||||||
"
|
|
||||||
builddir="$srcdir"/wheel-$pkgver
|
builddir="$srcdir"/wheel-$pkgver
|
||||||
options="!check" # circular with pytest
|
options="!check" # circular with pytest
|
||||||
|
|
||||||
|
@ -44,6 +42,5 @@ package() {
|
||||||
}
|
}
|
||||||
|
|
||||||
sha512sums="
|
sha512sums="
|
||||||
df45f00e9eaeae2f27f813f31591590c961da2f6bff15bba6fb2a14d529c221f39b29894b8da408fe49cd4b760840a0e05c4baef377ccfacd9983c0bba83d6d8 wheel-0.45.1.tar.gz
|
69219fb100d47da42999e0d0e4a023ac43489eb7f1755cb08f6d72a26bda1d435b3a9738340379b1a7f0054330711c7ca9865736cb0463a3f49004c25b61ebfe wheel-0.46.1.tar.gz
|
||||||
99376c78831a8b1a10c4b59cf07304043710c0f233149ff95dcb9cb2392c38b27d0fc7b7c1d4f4b6501f3a3a837e6091a93c0d10a54e016a7ae27d53ea9d47f9 use-system-packaging.patch
|
|
||||||
"
|
"
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
Upstream vendors packaging, use system packaging instead
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 8157d44..a5990e1 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
from distutils.core import setup
|
|
||||||
|
|
||||||
packages = \
|
|
||||||
-['wheel', 'wheel.cli', 'wheel.vendored', 'wheel.vendored.packaging']
|
|
||||||
+['wheel', 'wheel.cli']
|
|
||||||
|
|
||||||
package_data = \
|
|
||||||
{'': ['*']}
|
|
||||||
diff --git a/src/wheel/_bdist_wheel.py b/src/wheel/_bdist_wheel.py
|
|
||||||
index 6b811ee..45540ed 100644
|
|
||||||
--- a/src/wheel/_bdist_wheel.py
|
|
||||||
+++ b/src/wheel/_bdist_wheel.py
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
from shutil import rmtree
|
|
||||||
from typing import TYPE_CHECKING, Callable, Iterable, Literal, Sequence, cast
|
|
||||||
from zipfile import ZIP_DEFLATED, ZIP_STORED
|
|
||||||
+from packaging import tags
|
|
||||||
|
|
||||||
import setuptools
|
|
||||||
from setuptools import Command
|
|
||||||
@@ -27,8 +28,7 @@
|
|
||||||
from . import __version__ as wheel_version
|
|
||||||
from .metadata import pkginfo_to_metadata
|
|
||||||
from .util import log
|
|
||||||
-from .vendored.packaging import tags
|
|
||||||
-from .vendored.packaging import version as _packaging_version
|
|
||||||
+from packaging import version as _packaging_version
|
|
||||||
from .wheelfile import WheelFile
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
diff --git a/src/wheel/metadata.py b/src/wheel/metadata.py
|
|
||||||
index 6aa4362..27cc7fa 100644
|
|
||||||
--- a/src/wheel/metadata.py
|
|
||||||
+++ b/src/wheel/metadata.py
|
|
||||||
@@ -13,7 +13,7 @@ from email.message import Message
|
|
||||||
from email.parser import Parser
|
|
||||||
from typing import Generator, Iterable, Iterator, Literal
|
|
||||||
|
|
||||||
-from .vendored.packaging.requirements import Requirement
|
|
||||||
+from packaging.requirements import Requirement
|
|
||||||
|
|
||||||
|
|
||||||
def _nonblank(str: str) -> bool | Literal[""]:
|
|
||||||
diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
|
|
||||||
index b440b64..f94d752 100644
|
|
||||||
--- a/tests/test_bdist_wheel.py
|
|
||||||
+++ b/tests/test_bdist_wheel.py
|
|
||||||
@@ -23,7 +23,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
|
|
||||||
|
|
||||||
DEFAULT_FILES = {
|
|
||||||
--- a/src/wheel/cli/convert.py
|
|
||||||
+++ b/src/wheel/cli/convert.py
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
|
|
||||||
from .. import __version__
|
|
||||||
from ..metadata import generate_requirements
|
|
||||||
-from ..vendored.packaging.tags import parse_tag
|
|
||||||
+from packaging.tags import parse_tag
|
|
||||||
from ..wheelfile import WheelFile
|
|
||||||
|
|
||||||
egg_filename_re = re.compile(
|
|
Loading…
Add table
Add a link
Reference in a new issue