Date: Friday, January 28, 2022 @ 19:28:19 Author: dvzrv Revision: 1118503
upgpkg: python-pdm-pep517 0.10.2-4: Upgrade to 0.10.2. Update devendoring patch. Remove python-pyparsing from dependencies (the vendoring only brings it in because of python-packaging). Added: python-pdm-pep517/trunk/python-pdm-pep517-0.10.2-devendor.patch Modified: python-pdm-pep517/trunk/PKGBUILD Deleted: python-pdm-pep517/trunk/python-pdm-pep517-0.10.1-devendor.patch -----------------------------------------+ PKGBUILD | 18 ++-- python-pdm-pep517-0.10.1-devendor.patch | 111 ------------------------------ python-pdm-pep517-0.10.2-devendor.patch | 111 ++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 120 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-28 19:23:36 UTC (rev 1118502) +++ PKGBUILD 2022-01-28 19:28:19 UTC (rev 1118503) @@ -2,13 +2,13 @@ _name=pdm-pep517 pkgname=python-pdm-pep517 -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=4 pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata" arch=(any) url="https://github.com/pdm-project/pdm-pep517"; license=(MIT) -depends=(python-cerberus python-packaging python-pyparsing python-toml) +depends=(python-cerberus python-packaging python-toml) makedepends=(python-build python-install) checkdepends=(git python-pytest python-setuptools) optdepends=( @@ -16,17 +16,17 @@ ) source=( "https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"; - "${pkgname}-0.10.1-devendor.patch" + "${pkgname}-0.10.2-devendor.patch" ) -sha512sums=('a02d3d3262ec62dbe44fdd66b6f08c911f1760814da275ffb9f6a6356371738cff85d3917525752e2d174ec4f00ba235ecc5c27f41af8230b2522ce9b033c31f' - 'ac065d7ce661dec7c1f0e506539a3829f80183742178704fe71a476d72b9f48ff81083fb9c83fbf044063686bf321abdc3de830ff1d320f30c14c04cb3da7894') -b2sums=('954338341652557b2baa1415d9274c8c7c204b3a65211b40316ec09d7b824a63038f30e620bca2d8bb38d70e68b7e4c9bd7ce06432e987923665f3a88de373a9' - '1b6f12f0da26ad96afd40a9cad000bba2cf191ff801e81868db861e1d3723f02644f97b4289ca89d605083cb1663590a62fe93b5e789dcd8472876b0caa14db8') +sha512sums=('e5fc0b0c61a0bdf07fc276222e121c5bdbc1288b01e43d133bd2ed7c0d5402322de748dd7202ecb9a6795058abfcc6a7b959a9f7c99e3010b6e3c21c3dbc7e6e' + '25cea84fbb999190ddc2ca99d3550fb18f589aca13c75be39579f757ddbc7e9458a9707cb8164af9363d4ecccf4c5fe72d6b60ca53a94c061b222664a184fa11') +b2sums=('e539408432132a28b6ed9dfe89ed9599a6cf315626090298b7ad5e13f0d94b3f81b7e37eddcb9187748ae8cf34024b9281ef9976a1a44dbee19980d98bcc987a' + '43d088928cb4bb4c1eb5cc780955fb41420912fbcaa302bba1935606f4a3f65720ce4ad8583be02e4e08b494fc857779e4790f0ed6ce82cdead85ab65de55bc5') prepare() { cd "$_name-$pkgver" - # remove vendoring of python-cerberus, python-packaging, python-pyparsing and python-toml - patch -Np1 -i ../"${pkgname}-0.10.1-devendor.patch" + # remove vendoring of python-cerberus, python-packaging and python-toml + patch -Np1 -i ../"${pkgname}-0.10.2-devendor.patch" rm -frv pdm/pep517/_vendor } Deleted: python-pdm-pep517-0.10.1-devendor.patch =================================================================== --- python-pdm-pep517-0.10.1-devendor.patch 2022-01-28 19:23:36 UTC (rev 1118502) +++ python-pdm-pep517-0.10.1-devendor.patch 2022-01-28 19:28:19 UTC (rev 1118503) @@ -1,111 +0,0 @@ -diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py ---- a/pdm/pep517/metadata.py 2022-01-14 03:17:09.188181600 +0100 -+++ b/pdm/pep517/metadata.py 2022-01-23 18:27:01.686617124 +0100 -@@ -17,9 +17,9 @@ - Union, - ) - --from pdm.pep517._vendor import toml --from pdm.pep517._vendor.packaging.requirements import Requirement --from pdm.pep517._vendor.packaging.version import Version -+import toml -+from packaging.requirements import Requirement -+from packaging.version import Version - from pdm.pep517.license import license_lookup - from pdm.pep517.scm import get_version_from_scm - from pdm.pep517.utils import ( -diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py ---- a/pdm/pep517/scm.py 2022-01-14 03:17:09.188181600 +0100 -+++ b/pdm/pep517/scm.py 2022-01-23 18:24:08.022566589 +0100 -@@ -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-01-14 03:17:09.188181600 +0100 -+++ b/pdm/pep517/sdist.py 2022-01-23 18:23:43.549126455 +0100 -@@ -5,7 +5,7 @@ - from copy import copy - from typing import Any - --from pdm.pep517._vendor import toml -+import toml - from pdm.pep517.base import Builder - - -diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py ---- a/pdm/pep517/utils.py 2022-01-14 03:17:09.192181800 +0100 -+++ b/pdm/pep517/utils.py 2022-01-23 18:24:26.382645642 +0100 -@@ -9,10 +9,10 @@ - from sysconfig import get_config_var - from typing import Any, Callable, Generator, Iterable, Optional - --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-01-14 03:17:09.192181800 +0100 -+++ b/pdm/pep517/validator.py 2022-01-23 18:24:44.559389758 +0100 -@@ -1,6 +1,6 @@ - from typing import List, Mapping - --from pdm.pep517._vendor import cerberus -+import cerberus - - README_RULE = [ - {"type": "string"}, -diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py ---- a/pdm/pep517/wheel.py 2022-01-14 03:17:09.192181800 +0100 -+++ b/pdm/pep517/wheel.py 2022-01-23 18:25:17.606195226 +0100 -@@ -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, BuildError - from pdm.pep517.utils import get_abi_tag, get_platform - -diff -ruN a/pyproject.toml b/pyproject.toml ---- a/pyproject.toml 2022-01-14 03:17:09.192181800 +0100 -+++ b/pyproject.toml 2022-01-23 18:19:23.621206543 +0100 -@@ -6,7 +6,7 @@ - keywords = [ "packaging", "PEP 517", "build",] - dynamic = [] - classifiers = [ "Development Status :: 3 - Alpha", "Topic :: Software Development :: Build Tools", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10",] --dependencies = [] -+dependencies = ["cerberus", "packaging", "pyparsing", "toml"] - version = "0.10.1" - [[project.authors]] - name = "Frost Ming" -@@ -35,13 +35,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.towncrier] - package = "pdm" - filename = "CHANGELOG.md" Added: python-pdm-pep517-0.10.2-devendor.patch =================================================================== --- python-pdm-pep517-0.10.2-devendor.patch (rev 0) +++ python-pdm-pep517-0.10.2-devendor.patch 2022-01-28 19:28:19 UTC (rev 1118503) @@ -0,0 +1,111 @@ +diff -ruN a/pdm/pep517/metadata.py b/pdm/pep517/metadata.py +--- a/pdm/pep517/metadata.py 2022-01-28 01:55:49.669874400 +0100 ++++ b/pdm/pep517/metadata.py 2022-01-28 20:16:35.900594372 +0100 +@@ -17,9 +17,9 @@ + Union, + ) + +-from pdm.pep517._vendor import toml +-from pdm.pep517._vendor.packaging.requirements import Requirement +-from pdm.pep517._vendor.packaging.version import Version ++import toml ++from packaging.requirements import Requirement ++from packaging.version import Version + from pdm.pep517.license import license_lookup + from pdm.pep517.scm import get_version_from_scm + from pdm.pep517.utils import ( +diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py +--- a/pdm/pep517/scm.py 2022-01-28 01:55:49.669874400 +0100 ++++ b/pdm/pep517/scm.py 2022-01-28 20:16:35.900594372 +0100 +@@ -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-01-28 01:55:49.669874400 +0100 ++++ b/pdm/pep517/sdist.py 2022-01-28 20:16:35.900594372 +0100 +@@ -5,7 +5,7 @@ + from copy import copy + from typing import Any + +-from pdm.pep517._vendor import toml ++import toml + from pdm.pep517.base import Builder + + +diff -ruN a/pdm/pep517/utils.py b/pdm/pep517/utils.py +--- a/pdm/pep517/utils.py 2022-01-28 01:55:49.669874400 +0100 ++++ b/pdm/pep517/utils.py 2022-01-28 20:16:35.900594372 +0100 +@@ -8,10 +8,10 @@ + from pathlib import Path + from typing import Any, Callable, Generator, Iterable, Optional + +-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-01-28 01:55:49.669874400 +0100 ++++ b/pdm/pep517/validator.py 2022-01-28 20:16:35.900594372 +0100 +@@ -1,6 +1,6 @@ + from typing import List, Mapping + +-from pdm.pep517._vendor import cerberus ++import cerberus + + README_RULE = [ + {"type": "string"}, +diff -ruN a/pdm/pep517/wheel.py b/pdm/pep517/wheel.py +--- a/pdm/pep517/wheel.py 2022-01-28 01:55:49.669874400 +0100 ++++ b/pdm/pep517/wheel.py 2022-01-28 20:16:35.900594372 +0100 +@@ -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, BuildError + from pdm.pep517.utils import get_abi_tag, get_platform + +diff -ruN a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2022-01-28 01:55:49.669874400 +0100 ++++ b/pyproject.toml 2022-01-28 20:24:36.482085212 +0100 +@@ -6,7 +6,7 @@ + keywords = [ "packaging", "PEP 517", "build",] + dynamic = [] + classifiers = [ "Development Status :: 3 - Alpha", "Topic :: Software Development :: Build Tools", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10",] +-dependencies = [] ++dependencies = ["cerberus", "packaging", "toml"] + version = "0.10.2" + [[project.authors]] + name = "Frost Ming" +@@ -35,13 +35,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.towncrier] + package = "pdm" + filename = "CHANGELOG.md"
