[arch-commits] Commit in python-pdm-pep517/trunk (5 files)
David Runge
dvzrv at gemini.archlinux.org
Thu Jul 21 08:53:06 UTC 2022
Date: Thursday, July 21, 2022 @ 08:53:06
Author: dvzrv
Revision: 1254983
upgpkg: python-pdm-pep517 1:1.0.2-1: Upgrade to 1.0.2.
Update devendoring patch.
Added:
python-pdm-pep517/trunk/python-pdm-pep517-1.0.2-devendor.patch
Modified:
python-pdm-pep517/trunk/PKGBUILD
Deleted:
python-pdm-pep517/trunk/python-pdm-pep517-0.12.5-devendor.patch
python-pdm-pep517/trunk/python-pdm-pep517-0.12.7-devendor.patch
python-pdm-pep517/trunk/python-pdm-pep517-1.0.0-devendor.patch
-----------------------------------------+
PKGBUILD | 17 +--
python-pdm-pep517-0.12.5-devendor.patch | 107 -----------------------
python-pdm-pep517-0.12.7-devendor.patch | 107 -----------------------
python-pdm-pep517-1.0.0-devendor.patch | 129 ----------------------------
python-pdm-pep517-1.0.2-devendor.patch | 135 ++++++++++++++++++++++++++++++
5 files changed, 143 insertions(+), 352 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-21 08:31:11 UTC (rev 1254982)
+++ PKGBUILD 2022-07-21 08:53:06 UTC (rev 1254983)
@@ -4,7 +4,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=0.12.7
+pkgver=1.0.2
pkgrel=1
epoch=1
pkgdesc="A PEP 517 backend for PDM that supports PEP 621 metadata"
@@ -27,17 +27,16 @@
)
source=(
https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz
- $pkgname-0.12.7-devendor.patch
+ $pkgname-1.0.2-devendor.patch
)
-sha512sums=('4b3e40084c3bb4e3206fc00a98e24e28d46ec5efd4b76efebd4d03c7864a3cdefcc7cd429c4d5688a84f298738b8268f79e2ce7082421f539aff03cbe7d0c393'
- '7605bb15e16bde3807d97b6c3ff6359a40a5fd84adecfc53303938245c5c9704329fe59b0d32dbecf328895c44f5a04340e25560c8ec8d7511125fbc32a2590c')
-b2sums=('4e405e897a27eb83b837d0b4b7bc73ba5e79d9d2c66ceabd03cf712a4b5bfdb31be58c5a78aee64f32b819cb63908ac360b91758715f014c4a7d45954bdff96e'
- '7c7b462b325b080e3cd4141beff1870b310919b5f3d7e11878c2242f822ffca66e8b01007762afc158a6013a737798f4946646b44b36cdc7a236e8b2c10adbe7')
+sha512sums=('c8c7a201dd08e8def56cb133874c3ee0ea6a9d1bf89141db125e9b5426bc00f0fc3eac37c32fef8cb4e2598981c3f764169dd1e55d886124db2e97a5a4ee229a'
+ '7ce53fd5e39891aee5a20ad34f6bc55534b5a1a34949885029b1740201049f23235e8f7d18cb427518c5e9d20326f1cdf5f463a82eaec2d442aa7cad3732ff66')
+b2sums=('2a7597d706d1d96f9923db7e9c90210180c9da8f643aca18c6c636149d0e5d6c11df060766351b76895003326c1ea171fb085f9c93fe7be5dce9d34fbb1701fa'
+ '8025738bd56df56d50e6fc131f30115a345740d8ffc9b07e4a1cc5595ca4984ea47a6aa5549e4b4b85ca2a0ed0372072b66b509481d1450f0f6a4910696a450e')
prepare() {
- cd $_name-$pkgver
- patch -Np1 -i ../$pkgname-0.12.7-devendor.patch
- rm -frv pdm/pep517/_vendor
+ patch -Np1 -d $_name-$pkgver -i ../$pkgname-1.0.2-devendor.patch
+ rm -frv $_name-$pkgver/pdm/pep517/_vendor
}
build() {
Deleted: python-pdm-pep517-0.12.5-devendor.patch
===================================================================
--- python-pdm-pep517-0.12.5-devendor.patch 2022-07-21 08:31:11 UTC (rev 1254982)
+++ python-pdm-pep517-0.12.5-devendor.patch 2022-07-21 08:53:06 UTC (rev 1254983)
@@ -1,107 +0,0 @@
-diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
---- a/pdm/pep517/license.py 2022-05-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/license.py 2022-05-20 20:20:14.141378129 +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-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/metadata.py 2022-05-20 20:20:14.148044828 +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-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/scm.py 2022-05-20 20:20:14.148044828 +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-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/sdist.py 2022-05-20 20:20:14.148044828 +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-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/utils.py 2022-05-20 20:20:14.148044828 +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-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/validator.py 2022-05-20 20:20:14.148044828 +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-16 11:54:15.121063500 +0200
-+++ b/pdm/pep517/wheel.py 2022-05-20 20:20:14.148044828 +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-16 11:54:15.121063500 +0200
-+++ b/pyproject.toml 2022-05-20 20:20:35.858146674 +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.5"
-
- [project.license]
Deleted: python-pdm-pep517-0.12.7-devendor.patch
===================================================================
--- python-pdm-pep517-0.12.7-devendor.patch 2022-07-21 08:31:11 UTC (rev 1254982)
+++ python-pdm-pep517-0.12.7-devendor.patch 2022-07-21 08:53:06 UTC (rev 1254983)
@@ -1,107 +0,0 @@
-diff -ruN a/pdm/pep517/license.py b/pdm/pep517/license.py
---- a/pdm/pep517/license.py 2022-06-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/license.py 2022-06-29 20:39:54.764088325 +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-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/metadata.py 2022-06-29 20:37:50.848253022 +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-06-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/scm.py 2022-06-29 20:38:12.024778437 +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-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/sdist.py 2022-06-29 20:39:04.267761774 +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-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/utils.py 2022-06-29 20:34:45.569471470 +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-06-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/validator.py 2022-06-29 20:34:19.696305368 +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-08 10:21:35.115564000 +0200
-+++ b/pdm/pep517/wheel.py 2022-06-29 20:38:37.121277209 +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-06-08 10:21:35.115564000 +0200
-+++ b/pyproject.toml 2022-06-29 20:41:54.769940447 +0200
-@@ -21,7 +21,7 @@
- "Programming Language :: Python :: 3.9",
- "Programming Language :: Python :: 3.10",
- ]
--dependencies = []
-+dependencies = ["cerberus", "license-expression", "packaging", "tomli", "tomli-w"]
- version = "0.12.7"
-
- [project.license]
Deleted: python-pdm-pep517-1.0.0-devendor.patch
===================================================================
--- python-pdm-pep517-1.0.0-devendor.patch 2022-07-21 08:31:11 UTC (rev 1254982)
+++ python-pdm-pep517-1.0.0-devendor.patch 2022-07-21 08:53:06 UTC (rev 1254983)
@@ -1,129 +0,0 @@
-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
-
Added: python-pdm-pep517-1.0.2-devendor.patch
===================================================================
--- python-pdm-pep517-1.0.2-devendor.patch (rev 0)
+++ python-pdm-pep517-1.0.2-devendor.patch 2022-07-21 08:53:06 UTC (rev 1254983)
@@ -0,0 +1,135 @@
+diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
+--- a/pdm/pep517/base.py 2022-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/base.py 2022-07-21 10:42:50.692079277 +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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/license.py 2022-07-21 10:41:41.322359486 +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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/metadata.py 2022-07-21 10:43:29.681922662 +0200
+@@ -16,7 +16,7 @@
+ cast,
+ )
+
+-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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/scm.py 2022-07-21 10:43:11.761994569 +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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/sdist.py 2022-07-21 10:41:22.852434458 +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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/utils.py 2022-07-21 10:42:32.178820523 +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 InvalidRequirement, Requirement
+-from pdm.pep517._vendor.packaging.version import InvalidVersion, Version
++from packaging import tags
++from packaging.markers import Marker
++from packaging.requirements import InvalidRequirement, Requirement
++from packaging.version import InvalidVersion, Version
+ from pdm.pep517.exceptions import MetadataError
+ 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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/validator.py 2022-07-21 10:40:22.092682287 +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-07-10 07:00:32.663631000 +0200
++++ b/pdm/pep517/wheel.py 2022-07-21 10:40:53.322554669 +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-07-10 07:00:32.663631000 +0200
++++ b/pyproject.toml 2022-07-21 10:46:41.084494800 +0200
+@@ -21,7 +21,13 @@
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ ]
+-dependencies = []
++dependencies = [
++ "cerberus",
++ "license-expression",
++ "packaging",
++ "tomli",
++ "tomli-w",
++]
+ version = "1.0.2"
+
+ [project.license]
+diff -ruN a/tests/test_metadata.py b/tests/test_metadata.py
+--- a/tests/test_metadata.py 2022-07-10 07:00:32.667631100 +0200
++++ b/tests/test_metadata.py 2022-07-21 10:42:05.778927122 +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
+
More information about the arch-commits
mailing list