Skip to content

poetry: support for poetry metadata format 2.0 #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbhtt merged 3 commits into from
May 4, 2025
Merged

poetry: support for poetry metadata format 2.0 #353

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5d8016
poetry: Support the poetry 2.0 metadata format
Mar 11, 2023
1ae847c
poetry: Simplify some logic when looping over packages
bbhtt May 4, 2025
325ec58
poetry: Exclude items in dev group for v2 metadata on production arg
bbhtt May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions poetry/flatpak-poetry-generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,20 @@ def get_module_sources(parsed_lockfile: dict, include_devel: bool = True) -> lis
for section, packages in parsed_lockfile.items():
if section == "package":
for package in packages:
category = package.get("category")
groups = package.get("groups", [])
optional = package.get("optional", False)
if (
package["category"] == "dev"
and include_devel
and not package["optional"]
or package["category"] == "main"
and not package["optional"]
not category
or (category == "dev" and include_devel and not optional)
or (category == "main" and not optional)
):
hashes = []
# Check for old metadata format (poetry version < 1.0.0b2)
if "hashes" in parsed_lockfile["metadata"]:
hashes = parsed_lockfile["metadata"]["hashes"][package["name"]]
# Else new metadata format
else:
hashes = []
# metadata format 1.1
elif "files" in parsed_lockfile["metadata"]:
for package_name in parsed_lockfile["metadata"]["files"]:
if package_name == package["name"]:
package_files = parsed_lockfile["metadata"]["files"][
Expand All @@ -86,6 +87,14 @@ def get_module_sources(parsed_lockfile: dict, include_devel: bool = True) -> lis
match = hash_re.search(package_files[num]["hash"])
if match:
hashes.append(match.group(2))
# metadata format 2.0
else:
if groups == ["dev"] and not include_devel:
continue
for file in package["files"]:
match = hash_re.search(file["hash"])
if match:
hashes.append(match.group(2))
package_source = package.get("source")
if package_source and package_source["type"] == "directory":
print(f'Skipping download url and hash extraction for {package["name"]}, source type is directory')
Expand All @@ -112,12 +121,15 @@ def get_dep_names(parsed_lockfile: dict, include_devel: bool = True) -> list:
for section, packages in parsed_lockfile.items():
if section == "package":
for package in packages:
category = package.get("category")
groups = package.get("groups", [])
optional = package.get("optional", False)
if groups == ["dev"] and not include_devel:
continue
if (
package["category"] == "dev"
and include_devel
and not package["optional"]
or package["category"] == "main"
and not package["optional"]
not category
or (category == "dev" and include_devel and not optional)
or (category == "main" and not optional)
):
dep_names.append(package["name"])
return dep_names
Expand Down