Date: Tuesday, February 7, 2023 @ 08:48:31 Author: dvzrv Revision: 1395987
upgpkg: python-pdm-pep517 1:1.1.2-1: Upgrade to 1.1.2. Added: python-pdm-pep517/trunk/python-pdm-pep517-1.1.2-devendor.patch Modified: python-pdm-pep517/trunk/PKGBUILD Deleted: python-pdm-pep517/trunk/python-pdm-pep517-1.1.1-devendor.patch ----------------------------------------+ PKGBUILD | 14 +-- python-pdm-pep517-1.1.1-devendor.patch | 115 ------------------------------- python-pdm-pep517-1.1.2-devendor.patch | 115 +++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 122 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-07 08:48:08 UTC (rev 1395986) +++ PKGBUILD 2023-02-07 08:48:31 UTC (rev 1395987) @@ -6,7 +6,7 @@ pkgname=python-pdm-pep517 # WARNING: python-pdm may not be compatible with whatever pdm-pep517 can be upgraded to: # https://github.com/pdm-project/pdm/issues/1165 -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 epoch=1 pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata" @@ -31,16 +31,16 @@ ) source=( https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz - $pkgname-1.1.1-devendor.patch + $pkgname-1.1.2-devendor.patch ) -sha512sums=('f374ad13f1f06228956b5cfa8a8da455e80b31c68d33ceddbeb3e90925ff3bb4dd8d20dc037a99768490c4d44f38ebe119709ec261ec55c3f38c720747079ba3' - 'ab03d3dc4beb3a3530a1f14fb2f1eeef6c34f7a768b02312ccdc50e50c58f68a04b30a38af7bdbba2a8242131e5ef7451be54c6c3ab2146912eb3ae15fca4369') -b2sums=('4e6557278275c73bd0c26b20a793e57894481d6bba23b57ca350cee064adfbb82bd303fa6e69de86ee35deab55ed56d7c9c70c6d7ce66b8f29dbe2f1ff867a01' - '0c286fd2b69c6d499b54779d964d3267ca8f9392cdbbfcdb3a079f9ea26496fe58e4a8f97e4032941d545297fe02192ec49b8a6c39ed2eaec0bc9001a35285da') +sha512sums=('dcac4b188a900dbf06df0b00d871248cb995103bad6aec8cd45ef7550d1175279c9227735629b0588e6c4dfb993f70f433dc3817ff7cbc7ec7fe00257277f324' + 'a1342cf49f4da1e5e22f5ffe7b50f89e48b20de81058d4d560ab8ed978c67f4ec8b760bfb4fde273c6ab96a21c28936a55875449c377131505c938e7f6b23fca') +b2sums=('21f2d320c51fea9f60fe24d99bb4a743dc04936d42b7cbac41cb35424d3da36517f07f2ada356ae7e06010d8cd8bde1f6c1db29854948719126d9321f2587dcd' + 'e259c5dc7d2617370197c9ab9f2f55c2541e256af98fc219dca057cae687cea284ff53c94e80ed47b1c9a28dadf22d08c4c0ada35f0785167c140c949b81f5ee') prepare() { if (( $_devendored == 1 )); then - patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.1.1-devendor.patch + patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.1.2-devendor.patch rm -frv $_name-$pkgver/pdm/pep517/_vendor fi } Deleted: python-pdm-pep517-1.1.1-devendor.patch =================================================================== --- python-pdm-pep517-1.1.1-devendor.patch 2023-02-07 08:48:08 UTC (rev 1395986) +++ python-pdm-pep517-1.1.1-devendor.patch 2023-02-07 08:48:31 UTC (rev 1395987) @@ -1,115 +0,0 @@ -diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py ---- a/pdm/pep517/base.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/base.py 2023-02-06 11:21:13.921707644 +0100 -@@ -7,7 +7,7 @@ - from pathlib import Path - from typing import Any, Iterator, Mapping, TypeVar, cast - --from pdm.pep517._vendor import tomli -+import tomli - from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError - from pdm.pep517.metadata import Metadata - from pdm.pep517.utils import is_python_package, safe_version, to_filename -diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py ---- a/pdm/pep517/license.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/license.py 2023-02-06 11:21:43.308517776 +0100 -@@ -1,6 +1,6 @@ - import warnings - --from pdm.pep517._vendor.license_expression import ( -+from license_expression import ( - LicenseSymbol, - Licensing, - get_spdx_licensing, -diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py ---- a/pdm/pep517/metadata.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/metadata.py 2023-02-06 11:22:31.348744924 +0100 -@@ -5,7 +5,7 @@ - from pathlib import Path - from typing import Any, Callable, Generic, Iterable, Mapping, TypeVar, cast - --from pdm.pep517._vendor.packaging.requirements import InvalidRequirement, Requirement -+from packaging.requirements import InvalidRequirement, Requirement - from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError - from pdm.pep517.utils import ( - cd, -diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py ---- a/pdm/pep517/scm.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/scm.py 2023-02-06 11:22:58.088867697 +0100 -@@ -14,7 +14,7 @@ - from pathlib import Path - from typing import Any, Iterable, NamedTuple - --from pdm.pep517._vendor.packaging.version import Version -+from packaging.version import Version - - DEFAULT_TAG_REGEX = re.compile( - r"^(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$" -diff -ruN a/pdm/pep517/sdist.py b/pdm/pep517/sdist.py ---- a/pdm/pep517/sdist.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/sdist.py 2023-02-06 11:23:41.209060527 +0100 -@@ -6,7 +6,8 @@ - from copy import copy - from typing import Any, Iterator - --from pdm.pep517._vendor import tomli, tomli_w -+import tomli -+import tomli_w - from pdm.pep517.base import Builder - - -diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py ---- a/pdm/pep517/utils.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/utils.py 2023-02-06 11:25:52.322945698 +0100 -@@ -12,10 +12,10 @@ - from pathlib import Path - from typing import Callable, Generator, Iterable, Match - --from pdm.pep517._vendor.packaging import tags --from pdm.pep517._vendor.packaging.markers import Marker --from pdm.pep517._vendor.packaging.requirements import Requirement --from pdm.pep517._vendor.packaging.version import InvalidVersion, Version -+from packaging import tags -+from packaging.markers import Marker -+from packaging.requirements import Requirement -+from packaging.version import InvalidVersion, Version - from pdm.pep517.macosx_platform import calculate_macosx_platform_tag - - -diff -ruN a/pdm/pep517/validator.py b/pdm/pep517/validator.py ---- a/pdm/pep517/validator.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/validator.py 2023-02-06 11:26:08.483010544 +0100 -@@ -1,6 +1,6 @@ - from typing import Mapping - --from pdm.pep517._vendor import cerberus -+import cerberus - from pdm.pep517.exceptions import PEP621ValidationError - - README_RULE = [ -diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py ---- a/pdm/pep517/wheel.py 2023-01-30 09:16:32.496682600 +0100 -+++ b/pdm/pep517/wheel.py 2023-02-06 11:26:34.226445919 +0100 -@@ -20,8 +20,8 @@ - from typing import Any, BinaryIO, Generator, Mapping, NamedTuple, TextIO - - from pdm.pep517 import __version__ --from pdm.pep517._vendor.packaging import tags --from pdm.pep517._vendor.packaging.specifiers import SpecifierSet -+from packaging import tags -+from packaging.specifiers import SpecifierSet - from pdm.pep517.base import Builder - from pdm.pep517.exceptions import BuildError, PDMWarning - from pdm.pep517.utils import get_abi_tag, get_platform, show_warning -diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py ---- a/tests/test_metadata.py 2023-01-30 09:16:32.500682800 +0100 -+++ b/tests/test_metadata.py 2023-02-06 11:27:08.173244829 +0100 -@@ -5,7 +5,7 @@ - - import pytest - --from pdm.pep517._vendor import tomli -+import tomli - from pdm.pep517.metadata import Metadata - from tests import FIXTURES - Added: python-pdm-pep517-1.1.2-devendor.patch =================================================================== --- python-pdm-pep517-1.1.2-devendor.patch (rev 0) +++ python-pdm-pep517-1.1.2-devendor.patch 2023-02-07 08:48:31 UTC (rev 1395987) @@ -0,0 +1,115 @@ +diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py +--- a/pdm/pep517/base.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/base.py 2023-02-07 09:36:23.252222592 +0100 +@@ -7,7 +7,7 @@ + from pathlib import Path + from typing import Any, Iterator, Mapping, TypeVar, cast + +-from pdm.pep517._vendor import tomli ++import tomli + from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError + from pdm.pep517.metadata import Metadata + from pdm.pep517.utils import is_python_package, safe_version, to_filename +diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py +--- a/pdm/pep517/license.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/license.py 2023-02-07 09:36:23.252222592 +0100 +@@ -1,6 +1,6 @@ + import warnings + +-from pdm.pep517._vendor.license_expression import ( ++from license_expression import ( + LicenseSymbol, + Licensing, + get_spdx_licensing, +diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py +--- a/pdm/pep517/metadata.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/metadata.py 2023-02-07 09:36:23.252222592 +0100 +@@ -5,7 +5,7 @@ + from pathlib import Path + from typing import Any, Callable, Generic, Iterable, Mapping, TypeVar, cast + +-from pdm.pep517._vendor.packaging.requirements import InvalidRequirement, Requirement ++from packaging.requirements import InvalidRequirement, Requirement + from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError + from pdm.pep517.utils import ( + cd, +diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py +--- a/pdm/pep517/scm.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/scm.py 2023-02-07 09:36:23.252222592 +0100 +@@ -14,7 +14,7 @@ + from pathlib import Path + from typing import Any, Iterable, NamedTuple + +-from pdm.pep517._vendor.packaging.version import Version ++from packaging.version import Version + + DEFAULT_TAG_REGEX = re.compile( + r"^(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$" +diff -ruN a/pdm/pep517/sdist.py b/pdm/pep517/sdist.py +--- a/pdm/pep517/sdist.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/sdist.py 2023-02-07 09:36:23.252222592 +0100 +@@ -6,7 +6,8 @@ + from posixpath import join as pjoin + from typing import Any, Iterator + +-from pdm.pep517._vendor import tomli, tomli_w ++import tomli ++import tomli_w + from pdm.pep517.base import Builder + + +diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py +--- a/pdm/pep517/utils.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/utils.py 2023-02-07 09:36:23.252222592 +0100 +@@ -12,10 +12,10 @@ + from pathlib import Path + from typing import Callable, Generator, Iterable, Match + +-from pdm.pep517._vendor.packaging import tags +-from pdm.pep517._vendor.packaging.markers import Marker +-from pdm.pep517._vendor.packaging.requirements import Requirement +-from pdm.pep517._vendor.packaging.version import InvalidVersion, Version ++from packaging import tags ++from packaging.markers import Marker ++from packaging.requirements import Requirement ++from packaging.version import InvalidVersion, Version + from pdm.pep517.macosx_platform import calculate_macosx_platform_tag + + +diff -ruN a/pdm/pep517/validator.py b/pdm/pep517/validator.py +--- a/pdm/pep517/validator.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/validator.py 2023-02-07 09:36:23.252222592 +0100 +@@ -1,6 +1,6 @@ + from typing import Mapping + +-from pdm.pep517._vendor import cerberus ++import cerberus + from pdm.pep517.exceptions import PEP621ValidationError + + README_RULE = [ +diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py +--- a/pdm/pep517/wheel.py 2023-02-07 08:56:04.543331000 +0100 ++++ b/pdm/pep517/wheel.py 2023-02-07 09:36:23.252222592 +0100 +@@ -20,8 +20,8 @@ + from typing import Any, BinaryIO, Generator, Mapping, NamedTuple, TextIO + + from pdm.pep517 import __version__ +-from pdm.pep517._vendor.packaging import tags +-from pdm.pep517._vendor.packaging.specifiers import SpecifierSet ++from packaging import tags ++from packaging.specifiers import SpecifierSet + from pdm.pep517.base import Builder + from pdm.pep517.exceptions import BuildError, PDMWarning + from pdm.pep517.utils import get_abi_tag, get_platform, show_warning +diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py +--- a/tests/test_metadata.py 2023-02-07 08:56:04.547330900 +0100 ++++ b/tests/test_metadata.py 2023-02-07 09:36:23.252222592 +0100 +@@ -5,7 +5,7 @@ + + import pytest + +-from pdm.pep517._vendor import tomli ++import tomli + from pdm.pep517.metadata import Metadata + from tests import FIXTURES +
