Date: Monday, June 27, 2022 @ 16:41:50 Author: dvzrv Revision: 1239717
upgpkg: python-pdm-pep517 1.0.0-1: Upgrade to 1.0.0. Update devendoring patch. Added: python-pdm-pep517/trunk/python-pdm-pep517-1.0.0-devendor.patch Modified: python-pdm-pep517/trunk/PKGBUILD ----------------------------------------+ PKGBUILD | 14 +-- python-pdm-pep517-1.0.0-devendor.patch | 129 +++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-27 16:17:23 UTC (rev 1239716) +++ PKGBUILD 2022-06-27 16:41:50 UTC (rev 1239717) @@ -2,7 +2,7 @@ _name=pdm-pep517 pkgname=python-pdm-pep517 -pkgver=0.12.5 +pkgver=1.0.0 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.5-devendor.patch + $pkgname-1.0.0-devendor.patch ) -sha512sums=('3a9f5bf277077fc57c4bdfdd87ed141689a85e1c264f4b4cc8a265e0b93d5cb3b012194c3753c9ceda7069eeb6eb1278154efc61c74549c7e075bacf820336c3' - '0dcd97be55c121d752fff4574ae3d522f5fb0d1663466a998d03d18963142cbd6d65063f214f4efb45334d78f4d74eb4f9bc7fccdefe40d036d9fa52d74c23ae') -b2sums=('d6c1a94a7b1a75e71f5f3ca5e8f81c53b5bc2ef03d7a333b252b4575d2fc158909cca5f17e8b224b76a9dfd8f3ee1771b96a53959bde90100593a19c9665a3e1' - 'dedb122592daeb10070fa3c1d94ffd30574d1870f72675285a3456ef033ce54d518c981c38e256c74af76f9120a6f669effa2d719d249e802af472b5c8f42174') +sha512sums=('7dc0d2954d1804f6e013537ef33ef0f90498f4036dcd87d75a33fa443cbe9cfe3432c8d087b84498acbd23391d4aeab0e43c53055d4745ad105e9e6767531aeb' + '3a37894a930896cd99f526b79645a46e79f8a5d83e3f20493acdbc7be8185ee3e4780ba60fc5b2c97d3d4e1ae4378b49a5d099deabc9b998720f37387ae537af') +b2sums=('8f1165adbc25e9fe2a41d9cd62cf4f5d6f687b0ee8a72e22b3c3664eabcd115176e63556335f4888d61f05b5922bff5a4ba1caf3fe2a61e3c928eb79c3acb9ae' + 'fdf9743958ba8b748dddb432ccad8a2a2c09266a1130bdd259c27e342a4830d215e99bf6e756aa0d3279f26706cce7063d781c489fe1ddb7ea637195a509f454') 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.5-devendor.patch + patch -Np1 -i ../$pkgname-1.0.0-devendor.patch rm -frv pdm/pep517/_vendor } Added: python-pdm-pep517-1.0.0-devendor.patch =================================================================== --- python-pdm-pep517-1.0.0-devendor.patch (rev 0) +++ python-pdm-pep517-1.0.0-devendor.patch 2022-06-27 16:41:50 UTC (rev 1239717) @@ -0,0 +1,129 @@ +diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py +--- a/pdm/pep517/base.py 2022-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/base.py 2022-06-27 18:17:11.911092117 +0200 +@@ -6,7 +6,7 @@ + from pathlib import Path + from typing import Any, Dict, Iterator, List, Mapping, Optional, Tuple, TypeVar, Union + +-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 2022-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/license.py 2022-06-27 18:12:35.273490443 +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-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/metadata.py 2022-06-27 18:13:40.700378428 +0200 +@@ -15,7 +15,7 @@ + Union, + ) + +-from pdm.pep517._vendor.packaging.requirements import Requirement ++from packaging.requirements import Requirement + from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError + from pdm.pep517.license import normalize_expression + from pdm.pep517.utils import ( +diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py +--- a/pdm/pep517/scm.py 2022-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/scm.py 2022-06-27 18:12:35.276823788 +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-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/sdist.py 2022-06-27 18:12:35.280157133 +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-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/utils.py 2022-06-27 18:12:35.280157133 +0200 +@@ -9,10 +9,10 @@ + from pathlib import Path + from typing import Callable, Generator, Iterable, Optional, Type, 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-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/validator.py 2022-06-27 18:12:35.280157133 +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-06-25 10:46:34.274844000 +0200 ++++ b/pdm/pep517/wheel.py 2022-06-27 18:12:35.280157133 +0200 +@@ -16,8 +16,8 @@ + from typing import Any, Dict, 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, PDMWarning + from pdm.pep517.utils import get_abi_tag, get_platform, show_warning +diff -ruN a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2022-06-25 10:46:34.274844000 +0200 ++++ b/pyproject.toml 2022-06-27 18:19:24.901541101 +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 = "1.0.0" + + [project.license] +diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py +--- a/tests/test_metadata.py 2022-06-25 10:46:34.278844000 +0200 ++++ b/tests/test_metadata.py 2022-06-27 18:15:55.670834583 +0200 +@@ -5,7 +5,7 @@ + + import pytest + +-from pdm.pep517._vendor import tomli ++import tomli + from pdm.pep517.metadata import Metadata + from tests import FIXTURES +