python-pdm-backend/trunk/python-pdm-backend-2.0.7-devendor.patch

   1 diff -ruN a/src/pdm/backend/config.py b/src/pdm/backend/config.py
   2 --- a/src/pdm/backend/config.py 2023-05-15 05:57:35.042082800 +0200
   3 +++ b/src/pdm/backend/config.py 2023-05-15 22:51:48.780462699 +0200
   4 @@ -6,8 +6,8 @@
   5  from pathlib import Path
   6  from typing import Any, TypeVar
   7
   8 -from pdm.backend._vendor import tomli_w
   9 -from pdm.backend._vendor.pyproject_metadata import ConfigurationError, StandardMetadata
  10 +import tomli_w
  11 +from pyproject_metadata import ConfigurationError, StandardMetadata
  12  from pdm.backend.exceptions import ConfigError, ValidationError
  13  from pdm.backend.structures import Table
  14  from pdm.backend.utils import find_packages_iter
  15 @@ -15,7 +15,7 @@
  16  if sys.version_info >= (3, 11):
  17      import tomllib
  18  else:
  19 -    import pdm.backend._vendor.tomli as tomllib
  20 +    import tomli as tomllib
  21
  22  T = TypeVar("T")
  23
  24 diff -ruN a/src/pdm/backend/editable.py b/src/pdm/backend/editable.py
  25 --- a/src/pdm/backend/editable.py       2023-05-15 05:57:35.042082800 +0200
  26 +++ b/src/pdm/backend/editable.py       2023-05-15 22:54:15.767758192 +0200
  27 @@ -6,7 +6,7 @@
  28
  29  from editables import EditableProject
  30
  31 -from pdm.backend._vendor.packaging.utils import canonicalize_name
  32 +from packaging.utils import canonicalize_name
  33  from pdm.backend.exceptions import ConfigError, PDMWarning
  34  from pdm.backend.hooks.base import Context
  35  from pdm.backend.utils import to_filename
  36 diff -ruN a/src/pdm/backend/hooks/version/scm.py b/src/pdm/backend/hooks/version/scm.py
  37 --- a/src/pdm/backend/hooks/version/scm.py      2023-05-15 05:57:35.042082800 +0200
  38 +++ b/src/pdm/backend/hooks/version/scm.py      2023-05-15 22:53:47.910972227 +0200
  39 @@ -15,7 +15,7 @@
  40  from pathlib import Path
  41  from typing import Any, Iterable, NamedTuple
  42
  43 -from pdm.backend._vendor.packaging.version import Version
  44 +from packaging.version import Version
  45
  46  DEFAULT_TAG_REGEX = re.compile(
  47      r"^(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$"
  48 diff -ruN a/src/pdm/backend/intree.py b/src/pdm/backend/intree.py
  49 --- a/src/pdm/backend/intree.py 2023-05-15 05:57:35.042082800 +0200
  50 +++ b/src/pdm/backend/intree.py 2023-05-15 22:54:37.071182796 +0200
  51 @@ -8,7 +8,7 @@
  52  if sys.version_info >= (3, 11):
  53      import tomllib
  54  else:
  55 -    import pdm.backend._vendor.tomli as tomllib
  56 +    import tomli as tomllib
  57
  58
  59  def get_requires_for_build_wheel(
  60 diff -ruN a/src/pdm/backend/sdist.py b/src/pdm/backend/sdist.py
  61 --- a/src/pdm/backend/sdist.py  2023-05-15 05:57:35.042082800 +0200
  62 +++ b/src/pdm/backend/sdist.py  2023-05-15 22:52:25.820621000 +0200
  63 @@ -8,7 +8,7 @@
  64  from posixpath import join as pjoin
  65  from typing import Iterable
  66
  67 -from pdm.backend._vendor.packaging.utils import canonicalize_name
  68 +from packaging.utils import canonicalize_name
  69  from pdm.backend.base import Builder
  70  from pdm.backend.hooks import Context
  71  from pdm.backend.utils import safe_version, to_filename
  72 diff -ruN a/src/pdm/backend/utils.py b/src/pdm/backend/utils.py
  73 --- a/src/pdm/backend/utils.py  2023-05-15 05:57:35.042082800 +0200
  74 +++ b/src/pdm/backend/utils.py  2023-05-15 22:52:45.727372791 +0200
  75 @@ -13,10 +13,10 @@
  76  from pathlib import Path
  77  from typing import Callable, Generator, Iterable, Match
  78
  79 -from pdm.backend._vendor.packaging import tags
  80 -from pdm.backend._vendor.packaging.markers import Marker
  81 -from pdm.backend._vendor.packaging.requirements import Requirement
  82 -from pdm.backend._vendor.packaging.version import InvalidVersion, Version
  83 +from packaging import tags
  84 +from packaging.markers import Marker
  85 +from packaging.requirements import Requirement
  86 +from packaging.version import InvalidVersion, Version
  87  from pdm.backend.macosx_platform import calculate_macosx_platform_tag
  88
  89
  90 diff -ruN a/src/pdm/backend/wheel.py b/src/pdm/backend/wheel.py
  91 --- a/src/pdm/backend/wheel.py  2023-05-15 05:57:35.042082800 +0200
  92 +++ b/src/pdm/backend/wheel.py  2023-05-15 22:53:08.887471864 +0200
  93 @@ -14,9 +14,9 @@
  94  from pathlib import Path
  95  from typing import IO, Any, Iterable, Mapping, NamedTuple, cast
  96
  97 -from pdm.backend._vendor.packaging import tags
  98 -from pdm.backend._vendor.packaging.specifiers import SpecifierSet
  99 -from pdm.backend._vendor.packaging.utils import canonicalize_name
 100 +from packaging import tags
 101 +from packaging.specifiers import SpecifierSet
 102 +from packaging.utils import canonicalize_name
 103  from pdm.backend.base import Builder
 104  from pdm.backend.hooks import Context
 105  from pdm.backend.hooks.setuptools import SetuptoolsBuildHook