1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
diff -ruN a/pdm/pep517/base.py b/pdm/pep517/base.py
--- a/pdm/pep517/base.py 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/base.py 2023-02-07 09:36:23.252222592 +0100
@@ -7,7 +7,7 @@
from pathlib import Path
from typing import Any, Iterator, Mapping, TypeVar, cast
-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 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/license.py 2023-02-07 09:36:23.252222592 +0100
@@ -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 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/metadata.py 2023-02-07 09:36:23.252222592 +0100
@@ -5,7 +5,7 @@
from pathlib import Path
from typing import Any, Callable, Generic, Iterable, Mapping, TypeVar, cast
-from pdm.pep517._vendor.packaging.requirements import InvalidRequirement, Requirement
+from packaging.requirements import InvalidRequirement, Requirement
from pdm.pep517.exceptions import MetadataError, PDMWarning, ProjectError
from pdm.pep517.utils import (
cd,
diff -ruN a/pdm/pep517/scm.py b/pdm/pep517/scm.py
--- a/pdm/pep517/scm.py 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/scm.py 2023-02-07 09:36:23.252222592 +0100
@@ -14,7 +14,7 @@
from pathlib import Path
from typing import Any, Iterable, NamedTuple
-from pdm.pep517._vendor.packaging.version import Version
+from packaging.version import 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 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/sdist.py 2023-02-07 09:36:23.252222592 +0100
@@ -6,7 +6,8 @@
from posixpath import join as pjoin
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 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/utils.py 2023-02-07 09:36:23.252222592 +0100
@@ -12,10 +12,10 @@
from pathlib import Path
from typing import Callable, Generator, Iterable, Match
-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 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/validator.py 2023-02-07 09:36:23.252222592 +0100
@@ -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 2023-02-07 08:56:04.543331000 +0100
+++ b/pdm/pep517/wheel.py 2023-02-07 09:36:23.252222592 +0100
@@ -20,8 +20,8 @@
from typing import Any, BinaryIO, Generator, Mapping, NamedTuple, TextIO
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/tests/test_metadata.py b/tests/test_metadata.py
--- a/tests/test_metadata.py 2023-02-07 08:56:04.547330900 +0100
+++ b/tests/test_metadata.py 2023-02-07 09:36:23.252222592 +0100
@@ -5,7 +5,7 @@
import pytest
-from pdm.pep517._vendor import tomli
+import tomli
from pdm.pep517.metadata import Metadata
from tests import FIXTURES
|