106 lines
4.3 KiB
Diff
106 lines
4.3 KiB
Diff
diff -ruN a/src/pdm/backend/config.py b/src/pdm/backend/config.py
|
|
--- a/src/pdm/backend/config.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/config.py 2023-05-15 22:51:48.780462699 +0200
|
|
@@ -6,8 +6,8 @@
|
|
from pathlib import Path
|
|
from typing import Any, TypeVar
|
|
|
|
-from pdm.backend._vendor import tomli_w
|
|
-from pdm.backend._vendor.pyproject_metadata import ConfigurationError, StandardMetadata
|
|
+import tomli_w
|
|
+from pyproject_metadata import ConfigurationError, StandardMetadata
|
|
from pdm.backend.exceptions import ConfigError, ValidationError
|
|
from pdm.backend.structures import Table
|
|
from pdm.backend.utils import find_packages_iter
|
|
@@ -15,7 +15,7 @@
|
|
if sys.version_info >= (3, 11):
|
|
import tomllib
|
|
else:
|
|
- import pdm.backend._vendor.tomli as tomllib
|
|
+ import tomli as tomllib
|
|
|
|
T = TypeVar("T")
|
|
|
|
diff -ruN a/src/pdm/backend/editable.py b/src/pdm/backend/editable.py
|
|
--- a/src/pdm/backend/editable.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/editable.py 2023-05-15 22:54:15.767758192 +0200
|
|
@@ -6,7 +6,7 @@
|
|
|
|
from editables import EditableProject
|
|
|
|
-from pdm.backend._vendor.packaging.utils import canonicalize_name
|
|
+from packaging.utils import canonicalize_name
|
|
from pdm.backend.exceptions import ConfigError, PDMWarning
|
|
from pdm.backend.hooks.base import Context
|
|
from pdm.backend.utils import to_filename
|
|
diff -ruN a/src/pdm/backend/hooks/version/scm.py b/src/pdm/backend/hooks/version/scm.py
|
|
--- a/src/pdm/backend/hooks/version/scm.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/hooks/version/scm.py 2023-05-15 22:53:47.910972227 +0200
|
|
@@ -15,7 +15,7 @@
|
|
from pathlib import Path
|
|
from typing import Any, Iterable, NamedTuple
|
|
|
|
-from pdm.backend._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/src/pdm/backend/intree.py b/src/pdm/backend/intree.py
|
|
--- a/src/pdm/backend/intree.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/intree.py 2023-05-15 22:54:37.071182796 +0200
|
|
@@ -8,7 +8,7 @@
|
|
if sys.version_info >= (3, 11):
|
|
import tomllib
|
|
else:
|
|
- import pdm.backend._vendor.tomli as tomllib
|
|
+ import tomli as tomllib
|
|
|
|
|
|
def get_requires_for_build_wheel(
|
|
diff -ruN a/src/pdm/backend/sdist.py b/src/pdm/backend/sdist.py
|
|
--- a/src/pdm/backend/sdist.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/sdist.py 2023-05-15 22:52:25.820621000 +0200
|
|
@@ -8,7 +8,7 @@
|
|
from posixpath import join as pjoin
|
|
from typing import Iterable
|
|
|
|
-from pdm.backend._vendor.packaging.utils import canonicalize_name
|
|
+from packaging.utils import canonicalize_name
|
|
from pdm.backend.base import Builder
|
|
from pdm.backend.hooks import Context
|
|
from pdm.backend.utils import safe_version, to_filename
|
|
diff -ruN a/src/pdm/backend/utils.py b/src/pdm/backend/utils.py
|
|
--- a/src/pdm/backend/utils.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/utils.py 2023-05-15 22:52:45.727372791 +0200
|
|
@@ -13,10 +13,10 @@
|
|
from pathlib import Path
|
|
from typing import Callable, Generator, Iterable, Match
|
|
|
|
-from pdm.backend._vendor.packaging import tags
|
|
-from pdm.backend._vendor.packaging.markers import Marker
|
|
-from pdm.backend._vendor.packaging.requirements import Requirement
|
|
-from pdm.backend._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.backend.macosx_platform import calculate_macosx_platform_tag
|
|
|
|
|
|
diff -ruN a/src/pdm/backend/wheel.py b/src/pdm/backend/wheel.py
|
|
--- a/src/pdm/backend/wheel.py 2023-05-15 05:57:35.042082800 +0200
|
|
+++ b/src/pdm/backend/wheel.py 2023-05-15 22:53:08.887471864 +0200
|
|
@@ -14,9 +14,9 @@
|
|
from pathlib import Path
|
|
from typing import IO, Any, Iterable, Mapping, NamedTuple, cast
|
|
|
|
-from pdm.backend._vendor.packaging import tags
|
|
-from pdm.backend._vendor.packaging.specifiers import SpecifierSet
|
|
-from pdm.backend._vendor.packaging.utils import canonicalize_name
|
|
+from packaging import tags
|
|
+from packaging.specifiers import SpecifierSet
|
|
+from packaging.utils import canonicalize_name
|
|
from pdm.backend.base import Builder
|
|
from pdm.backend.hooks import Context
|
|
from pdm.backend.hooks.setuptools import SetuptoolsBuildHook
|