Date: Saturday, April 16, 2022 @ 15:03:58 Author: dvzrv Revision: 1186715
upgpkg: python-pdm-pep517 0.12.3-1: Upgrade to 0.12.3. Update patch for devendoring all vendored dependencies. Remove unneeded quotes and curly braces. Added: python-pdm-pep517/trunk/python-pdm-pep517-0.12.3-devendor.patch Modified: python-pdm-pep517/trunk/PKGBUILD Deleted: python-pdm-pep517/trunk/python-pdm-pep517-0.10.2-devendor.patch -----------------------------------------+ PKGBUILD | 39 ++++---- python-pdm-pep517-0.10.2-devendor.patch | 111 ----------------------- python-pdm-pep517-0.12.3-devendor.patch | 144 ++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 130 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-16 14:59:10 UTC (rev 1186714) +++ PKGBUILD 2022-04-16 15:03:58 UTC (rev 1186715) @@ -2,13 +2,13 @@ _name=pdm-pep517 pkgname=python-pdm-pep517 -pkgver=0.10.2 -pkgrel=4 +pkgver=0.12.3 +pkgrel=1 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-toml) +depends=(python-boolean.py python-cerberus python-license-expression python-packaging python-pyparsing python-tomli python-tomli-w) makedepends=(python-build python-installer) checkdepends=(git python-pytest python-setuptools) optdepends=( @@ -15,39 +15,40 @@ 'python-setuptools: for setuptools support' ) source=( - "https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"; - "${pkgname}-0.10.2-devendor.patch" + https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz + $pkgname-0.12.3-devendor.patch ) -sha512sums=('e5fc0b0c61a0bdf07fc276222e121c5bdbc1288b01e43d133bd2ed7c0d5402322de748dd7202ecb9a6795058abfcc6a7b959a9f7c99e3010b6e3c21c3dbc7e6e' - '25cea84fbb999190ddc2ca99d3550fb18f589aca13c75be39579f757ddbc7e9458a9707cb8164af9363d4ecccf4c5fe72d6b60ca53a94c061b222664a184fa11') -b2sums=('e539408432132a28b6ed9dfe89ed9599a6cf315626090298b7ad5e13f0d94b3f81b7e37eddcb9187748ae8cf34024b9281ef9976a1a44dbee19980d98bcc987a' - '43d088928cb4bb4c1eb5cc780955fb41420912fbcaa302bba1935606f4a3f65720ce4ad8583be02e4e08b494fc857779e4790f0ed6ce82cdead85ab65de55bc5') +sha512sums=('4da765132f278fec2e1fc6705b00e3f660e030264e0d21be8528dd5389fa488a352e09977e850e1e203c50ff5d5e0798fc685505f5bc15a4cd93b28114601377' + '177bd0e80b43c8b28c379fb33dd2347fe5d64c7cbc9257b7cf39271e114ad176ddb7f2f4cfae609ccce52f9a10e61a13feb729288ca07c7f6b6a39714232d748') +b2sums=('8f784e7e0314bd91a9dddd096c6d7b456f60f2305741b648cec38cfa8f7b5e027b56dffae3c3b81307e0fe928f85e4acba32d516ce5c37fd6cff4c0c897fef8f' + '6102f342b461e89362a9cd9e45a8667b6fedad1f1c0362d8bb40a5bb0b141acf439c4a9af4880b869300e55270cc355993c13e33f754e33a174b2fba08cedc03') prepare() { - cd "$_name-$pkgver" - # remove vendoring of python-cerberus, python-packaging and python-toml - patch -Np1 -i ../"${pkgname}-0.10.2-devendor.patch" + cd $_name-$pkgver + # 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 rm -frv pdm/pep517/_vendor } build() { - cd "$_name-$pkgver" + cd $_name-$pkgver python -m build --wheel --skip-dependency-check --no-isolation } check() { - cd "$_name-$pkgver" + cd $_name-$pkgver # set default git config for test git config --global user.email "[email protected]" git config --global user.name "Your Name" - PYTHONPATH="build:$PYTHONPATH" - pytest -v + pytest -vv } package() { - cd "$_name-$pkgver" + cd $_name-$pkgver python -m installer --destdir="$pkgdir" dist/*.whl - install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/" - install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}/" + install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/" } Deleted: python-pdm-pep517-0.10.2-devendor.patch =================================================================== --- python-pdm-pep517-0.10.2-devendor.patch 2022-04-16 14:59:10 UTC (rev 1186714) +++ python-pdm-pep517-0.10.2-devendor.patch 2022-04-16 15:03:58 UTC (rev 1186715) @@ -1,111 +0,0 @@ -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" Added: python-pdm-pep517-0.12.3-devendor.patch =================================================================== --- python-pdm-pep517-0.12.3-devendor.patch (rev 0) +++ python-pdm-pep517-0.12.3-devendor.patch 2022-04-16 15:03:58 UTC (rev 1186715) @@ -0,0 +1,144 @@ +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"
