Skip to content

Commit 88c3f44

Browse files
committed
fix: update to pyproject_metadata 0.9.0b4
Signed-off-by: Frost Ming <me@frostming.com>
1 parent 856d849 commit 88c3f44

File tree

3 files changed

+175
-104
lines changed

3 files changed

+175
-104
lines changed

scripts/patches/pyproject_metadata.patch

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/pdm/backend/_vendor/pyproject_metadata/__init__.py b/src/pdm/backend/_vendor/pyproject_metadata/__init__.py
2-
index 52289dc..7ef9fc9 100644
2+
index 70c452b..6a3af49 100644
33
--- a/src/pdm/backend/_vendor/pyproject_metadata/__init__.py
44
+++ b/src/pdm/backend/_vendor/pyproject_metadata/__init__.py
55
@@ -20,18 +20,18 @@ if typing.TYPE_CHECKING:
@@ -19,15 +19,15 @@ index 52289dc..7ef9fc9 100644
1919
-import packaging.specifiers
2020
-import packaging.utils
2121
-import packaging.version
22-
+import pdm.backend._vendor.packaging.markers as pkg_markers
23-
+import pdm.backend._vendor.packaging.requirements as pkg_requirements
24-
+import pdm.backend._vendor.packaging.specifiers as pkg_specifiers
25-
+import pdm.backend._vendor.packaging.utils as pkg_utils
26-
+import pdm.backend._vendor.packaging.version as pkg_version
22+
+import pdm.backend._vendor.packaging.markers as pkg_markers
23+
+import pdm.backend._vendor.packaging.requirements as pkg_requirements
24+
+import pdm.backend._vendor.packaging.specifiers as pkg_specifiers
25+
+import pdm.backend._vendor.packaging.utils as pkg_utils
26+
+import pdm.backend._vendor.packaging.version as pkg_version
2727

2828

29-
__version__ = '0.9.0b3'
30-
@@ -351,8 +351,8 @@ class ProjectFetcher(DataFetcher):
29+
__version__ = '0.9.0b4'
30+
@@ -397,8 +397,8 @@ class ProjectFetcher(DataFetcher):
3131
requirements: list[Requirement] = []
3232
for req in requirement_strings:
3333
try:
@@ -38,7 +38,7 @@ index 52289dc..7ef9fc9 100644
3838
msg = (
3939
'Field "project.dependencies" contains an invalid PEP 508 '
4040
f'requirement string "{req}" ("{e}")'
41-
@@ -393,9 +393,9 @@ class ProjectFetcher(DataFetcher):
41+
@@ -439,9 +439,9 @@ class ProjectFetcher(DataFetcher):
4242
raise ConfigurationError(msg)
4343
try:
4444
requirements_dict[extra].append(
@@ -50,7 +50,7 @@ index 52289dc..7ef9fc9 100644
5050
msg = (
5151
f'Field "project.optional-dependencies.{extra}" contains '
5252
f'an invalid PEP 508 requirement string "{req}" ("{e}")'
53-
@@ -453,12 +453,12 @@ class Readme(typing.NamedTuple):
53+
@@ -501,12 +501,12 @@ class Readme:
5454
@dataclasses.dataclass
5555
class StandardMetadata:
5656
name: str
@@ -65,7 +65,7 @@ index 52289dc..7ef9fc9 100644
6565
dependencies: list[Requirement] = dataclasses.field(default_factory=list)
6666
optional_dependencies: dict[str, list[Requirement]] = dataclasses.field(
6767
default_factory=dict
68-
@@ -547,7 +547,7 @@ class StandardMetadata:
68+
@@ -617,7 +617,7 @@ class StandardMetadata:
6969

7070
@property
7171
def canonical_name(self) -> str:
@@ -74,7 +74,7 @@ index 52289dc..7ef9fc9 100644
7474

7575
@classmethod
7676
def from_pyproject(
77-
@@ -590,7 +590,7 @@ class StandardMetadata:
77+
@@ -661,7 +661,7 @@ class StandardMetadata:
7878

7979
version_string = fetcher.get_str('project.version')
8080
requires_python_string = fetcher.get_str('project.requires-python')
@@ -83,16 +83,16 @@ index 52289dc..7ef9fc9 100644
8383

8484
if version is None and 'version' not in dynamic:
8585
msg = 'Field "project.version" missing and "version" not specified in "project.dynamic"'
86-
@@ -608,7 +608,7 @@ class StandardMetadata:
87-
fetcher.get_license(project_dir),
88-
fetcher.get_license_files(project_dir),
89-
fetcher.get_readme(project_dir),
86+
@@ -673,7 +673,7 @@ class StandardMetadata:
87+
description = fetcher.get_str('project.description')
88+
89+
requires_python = (
9090
- packaging.specifiers.SpecifierSet(requires_python_string)
9191
+ pkg_specifiers.SpecifierSet(requires_python_string)
9292
if requires_python_string
93-
else None,
94-
fetcher.get_dependencies(),
95-
@@ -720,15 +720,15 @@ class StandardMetadata:
93+
else None
94+
)
95+
@@ -791,15 +791,15 @@ class StandardMetadata:
9696
requirement = copy.copy(requirement)
9797
if requirement.marker:
9898
if 'or' in requirement.marker._markers:

0 commit comments

Comments
 (0)