Date: Thursday, May 5, 2022 @ 22:25:15 Author: dvzrv Revision: 1195553
upgpkg: python-pdm-pep517 0.12.4-1: Upgrade to 0.12.4. Update patch to devendor vendored libraries. Added: python-pdm-pep517/trunk/python-pdm-pep517-0.12.4-devendor.patch Modified: python-pdm-pep517/trunk/PKGBUILD Deleted: python-pdm-pep517/trunk/python-pdm-pep517-0.12.3-devendor.patch -----------------------------------------+ PKGBUILD | 14 +- python-pdm-pep517-0.12.3-devendor.patch | 144 ------------------------------ python-pdm-pep517-0.12.4-devendor.patch | 107 ++++++++++++++++++++++ 3 files changed, 114 insertions(+), 151 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-05 22:09:19 UTC (rev 1195552) +++ PKGBUILD 2022-05-05 22:25:15 UTC (rev 1195553) @@ -2,7 +2,7 @@ _name=pdm-pep517 pkgname=python-pdm-pep517 -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=1 pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata" arch=(any) @@ -16,12 +16,12 @@ ) source=( https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz - $pkgname-0.12.3-devendor.patch + $pkgname-0.12.4-devendor.patch ) -sha512sums=('4da765132f278fec2e1fc6705b00e3f660e030264e0d21be8528dd5389fa488a352e09977e850e1e203c50ff5d5e0798fc685505f5bc15a4cd93b28114601377' - '177bd0e80b43c8b28c379fb33dd2347fe5d64c7cbc9257b7cf39271e114ad176ddb7f2f4cfae609ccce52f9a10e61a13feb729288ca07c7f6b6a39714232d748') -b2sums=('8f784e7e0314bd91a9dddd096c6d7b456f60f2305741b648cec38cfa8f7b5e027b56dffae3c3b81307e0fe928f85e4acba32d516ce5c37fd6cff4c0c897fef8f' - '6102f342b461e89362a9cd9e45a8667b6fedad1f1c0362d8bb40a5bb0b141acf439c4a9af4880b869300e55270cc355993c13e33f754e33a174b2fba08cedc03') +sha512sums=('16feb14c9b344357e1853a45e100724a4a3b426867488d9e37493dc9e9c884de51d6b617d2c82daab56f9e2050a0cfea830e84443e9c837854908417de26ad2b' + '40ce9ff4490d7bec7b29c9be35e53730a069cfea83d6b2eb9f8a4652a1587cef26fc46fd20e75684cbfc0128e6b975154bdb2bdca0e121b689721e81766e06b3') +b2sums=('c3c02bac0269b7ef992567c99a4978632b4fc1fb9d07b1000357df39018c69e6d2f081d9b46d861e90eecf8925f14853a530fc4ccd850b48ceebd674a06f2df8' + 'e87d1a79fc162c34169826367382194ea3fa6066bbea54be9c28a76e4ba8ed8b9035adf7050d03e8477e6376a5a831e311d3a5d877281ac5a9886347fd3405b2') prepare() { cd $_name-$pkgver @@ -28,7 +28,7 @@ # remove vendoring of python-boolean.py, python-cerberus, # python-license-expression, python-packaging, python-pyparsing, # python-tomli, python-tomli-w - patch -Np1 -i ../$pkgname-0.12.3-devendor.patch + patch -Np1 -i ../$pkgname-0.12.4-devendor.patch rm -frv pdm/pep517/_vendor } Deleted: python-pdm-pep517-0.12.3-devendor.patch =================================================================== --- python-pdm-pep517-0.12.3-devendor.patch 2022-05-05 22:09:19 UTC (rev 1195552) +++ python-pdm-pep517-0.12.3-devendor.patch 2022-05-05 22:25:15 UTC (rev 1195553) @@ -1,144 +0,0 @@ -diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py ---- a/pdm/pep517/license.py 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/license.py 2022-04-16 16:58:15.646946868 +0200 -@@ -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 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/metadata.py 2022-04-16 16:55:33.869757913 +0200 -@@ -17,8 +17,8 @@ - Union, - ) - --from pdm.pep517._vendor import tomli --from pdm.pep517._vendor.packaging.requirements import Requirement -+import tomli -+from packaging.requirements import Requirement - from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError - from pdm.pep517.license import normalize_expression - from pdm.pep517.scm import get_version_from_scm -diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py ---- a/pdm/pep517/scm.py 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/scm.py 2022-04-16 16:55:50.269810924 +0200 -@@ -11,8 +11,8 @@ - from datetime import datetime - from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union - --from pdm.pep517._vendor.packaging.version import LegacyVersion, Version --from pdm.pep517._vendor.packaging.version import parse as parse_version -+from packaging.version import LegacyVersion, Version -+from packaging.version import parse as parse_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 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/sdist.py 2022-04-16 16:57:56.110217182 +0200 -@@ -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 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/utils.py 2022-04-16 16:53:18.682653963 +0200 -@@ -8,10 +8,10 @@ - from pathlib import Path - from typing import Callable, Generator, Iterable, Optional, Union - --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 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/validator.py 2022-04-16 16:57:30.480134513 +0200 -@@ -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 2022-04-01 15:46:56.455537300 +0200 -+++ b/pdm/pep517/wheel.py 2022-04-16 16:52:45.555880020 +0200 -@@ -15,8 +15,8 @@ - from typing import Any, Generator, List, Mapping, Optional, TextIO, Tuple, Union - - 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 - from pdm.pep517.utils import get_abi_tag, get_platform -diff -ruN a/pyproject.toml b/pyproject.toml ---- a/pyproject.toml 2022-04-01 15:46:56.455537300 +0200 -+++ b/pyproject.toml 2022-04-16 17:00:29.350711207 +0200 -@@ -21,7 +21,7 @@ - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - ] --dependencies = [] -+dependencies = ["boolean.py", "cerberus", "license-expression", "packaging", "pyparsing", "tomli", "tomli-w"] - version = "0.12.3" - - [project.license] -@@ -60,36 +60,6 @@ - line-length = 88 - exclude = "/(\n \\.eggs\n | \\.git\n | \\.mypy_cache\n | build\n | dist\n | __pypackages__\n | pdm/pep517/_vendor\n)/\n" - --[tool.vendoring] --destination = "pdm/pep517/_vendor/" --requirements = "pdm/pep517/_vendor/vendor.txt" --namespace = "pdm.pep517._vendor" --protected-files = [ -- "__init__.py", -- "README.md", -- "vendor.txt", --] --patches-dir = "scripts/patches" -- --[tool.vendoring.transformations] --substitute = [] --drop = [ -- "bin/", -- "*.so", -- "typing.*", -- "*/tests/", -- "spdx/data/*.txt", -- "cerberus/benchmarks/", -- "**/test_*.py", -- "**/*_test.py", --] -- --[tool.vendoring.typing-stubs] -- --[tool.vendoring.license.directories] -- --[tool.vendoring.license.fallback-urls] -- - [tool.towncrier] - package = "pdm" - filename = "CHANGELOG.md" Added: python-pdm-pep517-0.12.4-devendor.patch =================================================================== --- python-pdm-pep517-0.12.4-devendor.patch (rev 0) +++ python-pdm-pep517-0.12.4-devendor.patch 2022-05-05 22:25:15 UTC (rev 1195553) @@ -0,0 +1,107 @@ +diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py +--- a/pdm/pep517/license.py 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/license.py 2022-05-06 00:16:08.870022181 +0200 +@@ -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 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/metadata.py 2022-05-06 00:16:37.623454122 +0200 +@@ -17,8 +17,8 @@ + Union, + ) + +-from pdm.pep517._vendor import tomli +-from pdm.pep517._vendor.packaging.requirements import Requirement ++import tomli ++from packaging.requirements import Requirement + from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError + from pdm.pep517.license import normalize_expression + from pdm.pep517.scm import get_version_from_scm +diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py +--- a/pdm/pep517/scm.py 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/scm.py 2022-05-06 00:17:33.296978562 +0200 +@@ -11,8 +11,8 @@ + from datetime import datetime + from typing import Any, Dict, Iterable, List, NamedTuple, Optional, Tuple, Union + +-from pdm.pep517._vendor.packaging.version import LegacyVersion, Version +-from pdm.pep517._vendor.packaging.version import parse as parse_version ++from packaging.version import LegacyVersion, Version ++from packaging.version import parse as parse_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 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/sdist.py 2022-05-06 00:18:03.283748195 +0200 +@@ -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 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/utils.py 2022-05-06 00:17:12.223572876 +0200 +@@ -8,10 +8,10 @@ + from pathlib import Path + from typing import Callable, Generator, Iterable, Optional, Union + +-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 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/validator.py 2022-05-06 00:18:23.523817701 +0200 +@@ -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 2022-05-02 15:34:09.672311000 +0200 ++++ b/pdm/pep517/wheel.py 2022-05-06 00:18:47.387233055 +0200 +@@ -15,8 +15,8 @@ + from typing import Any, Generator, List, Mapping, Optional, TextIO, Tuple, Union + + 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 + from pdm.pep517.utils import get_abi_tag, get_platform +diff -ruN a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2022-05-02 15:34:09.672311000 +0200 ++++ b/pyproject.toml 2022-05-06 00:21:06.007709884 +0200 +@@ -21,7 +21,7 @@ + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + ] +-dependencies = [] ++dependencies = ["boolean.py", "cerberus", "license_expression", "packaging", "pyparsing", "tomli", "tomli_w"] + version = "0.12.4" + + [project.license]
