132 lines
4.5 KiB
Diff
132 lines
4.5 KiB
Diff
--- a/src/pdm/backend/base.py
|
|
+++ b/src/pdm/backend/base.py
|
|
@@ -16,7 +16,7 @@
|
|
cast,
|
|
)
|
|
|
|
-from pdm.backend._vendor.pyproject_metadata import StandardMetadata
|
|
+from pyproject_metadata import StandardMetadata
|
|
from pdm.backend.config import Config
|
|
from pdm.backend.hooks import BuildHookInterface, Context
|
|
from pdm.backend.hooks.version import DynamicVersionBuildHook
|
|
--- a/src/pdm/backend/config.py
|
|
+++ b/src/pdm/backend/config.py
|
|
@@ -7,8 +7,8 @@
|
|
from pathlib import Path
|
|
from typing import TYPE_CHECKING, 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, is_relative_path
|
|
@@ -16,7 +16,7 @@
|
|
if sys.version_info >= (3, 11):
|
|
import tomllib
|
|
else:
|
|
- import pdm.backend._vendor.tomli as tomllib
|
|
+ import tomli as tomllib
|
|
|
|
T = TypeVar("T")
|
|
|
|
--- a/src/pdm/backend/editable.py
|
|
+++ b/src/pdm/backend/editable.py
|
|
@@ -4,8 +4,8 @@
|
|
import warnings
|
|
from pathlib import Path
|
|
|
|
-from pdm.backend._vendor.editables import EditableProject
|
|
-from pdm.backend._vendor.packaging.utils import canonicalize_name
|
|
+from editables import EditableProject
|
|
+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
|
|
--- a/src/pdm/backend/hooks/version/__init__.py
|
|
+++ b/src/pdm/backend/hooks/version/__init__.py
|
|
@@ -7,7 +7,7 @@
|
|
from pathlib import Path
|
|
from typing import Callable
|
|
|
|
-from pdm.backend._vendor.packaging.version import Version
|
|
+from packaging.version import Version
|
|
from pdm.backend.exceptions import ConfigError, PDMWarning, ValidationError
|
|
from pdm.backend.hooks.base import Context
|
|
from pdm.backend.hooks.version.scm import SCMVersion as SCMVersion
|
|
--- a/src/pdm/backend/hooks/version/scm.py
|
|
+++ b/src/pdm/backend/hooks/version/scm.py
|
|
@@ -16,7 +16,7 @@
|
|
from pathlib import Path
|
|
from typing import TYPE_CHECKING, NamedTuple
|
|
|
|
-from pdm.backend._vendor.packaging.version import Version
|
|
+from packaging.version import Version
|
|
|
|
if TYPE_CHECKING:
|
|
from _typeshed import StrPath
|
|
--- a/src/pdm/backend/intree.py
|
|
+++ b/src/pdm/backend/intree.py
|
|
@@ -16,7 +16,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(
|
|
--- a/src/pdm/backend/sdist.py
|
|
+++ b/src/pdm/backend/sdist.py
|
|
@@ -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 normalize_file_permissions, safe_version, to_filename
|
|
--- a/src/pdm/backend/utils.py
|
|
+++ b/src/pdm/backend/utils.py
|
|
@@ -13,9 +13,9 @@
|
|
from pathlib import Path
|
|
from typing import Any, Callable, Generator, Iterable, Match
|
|
|
|
-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.markers import Marker
|
|
+from packaging.requirements import Requirement
|
|
+from packaging.version import InvalidVersion, Version
|
|
from pdm.backend.exceptions import ConfigError
|
|
|
|
|
|
--- a/src/pdm/backend/wheel.py
|
|
+++ b/src/pdm/backend/wheel.py
|
|
@@ -15,9 +15,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 _build_tag_regex, canonicalize_name
|
|
+from packaging import tags
|
|
+from packaging.specifiers import SpecifierSet
|
|
+from packaging.utils import _build_tag_regex, canonicalize_name
|
|
from pdm.backend.base import Builder
|
|
from pdm.backend.hooks import Context
|
|
from pdm.backend.hooks.setuptools import SetuptoolsBuildHook
|
|
--- a/tests/pdm/backend/hooks/version/test_scm.py
|
|
+++ b/tests/pdm/backend/hooks/version/test_scm.py
|
|
@@ -12,7 +12,7 @@
|
|
|
|
import pytest
|
|
|
|
-from pdm.backend._vendor.packaging.version import Version
|
|
+from packaging.version import Version
|
|
from pdm.backend.hooks.version.scm import (
|
|
SCMVersion,
|
|
default_version_formatter,
|