fix: support freezing multiple versions of a package (#30)

* fix: support freezing multiple versions of a package

In cases where there is more than one locked version of a package (due
to Python version or platform constraints for example), freeze all
locked versions.

* adjust test to reflect multiple frozen versions of a single package

Author: ajkerrigan

src/poetry_plugin_freeze/app.py

@@ -2,6 +2,7 @@
 import csv
 from email.parser import Parser
 from functools import lru_cache
+from itertools import chain
 import hashlib
 from io import StringIO, TextIOWrapper
 from pathlib import Path
@@ -155,15 +156,15 @@ def freeze(self):
         wheels = list(self.get_wheels())
         if not wheels:
             return []
-        dep_package_map = self.get_dep_packages()
+        dep_packages = self.get_dep_packages()
         for w in wheels:
-            self.freeze_wheel(w, dep_package_map)
+            self.freeze_wheel(w, dep_packages)
         return wheels
 
     def get_dep_packages(self):
         root_package = self.poetry.package.with_dependency_groups([MAIN_GROUP], only=True)
 
-        dep_packages = list(
+        return list(
             get_project_dependency_packages(
                 self.poetry.locker,
                 project_requires=root_package.all_requires,
@@ -174,7 +175,6 @@ def get_dep_packages(self):
                 extras=root_package.extras,
             )
         )
-        return {p.package.name: p for p in dep_packages}
 
     @lru_cache(maxsize=None)
     def get_dependency_sources(self):
@@ -197,7 +197,9 @@ def _with_python_marker(requirements, root_package):
 
         repository = self.poetry.locker.locked_repository()
         root_package = self.poetry.package
-        locked_packages_by_name = {p.name: [p] for p in repository.packages}
+        locked_packages_by_name = {}
+        for pkg in repository.packages:
+            locked_packages_by_name.setdefault(pkg.name, []).append(pkg)
         dependency_sources = {}
         base_requires = [
             dep
@@ -249,7 +251,7 @@ def compact_markers(self, dependency):
     def get_frozen_deps(self, dep_packages, exclude_packages=None):
         lines = []
         dependency_sources = self.get_dependency_sources()
-        for pkg_name, dep_package in dep_packages.items():
+        for dep_package in dep_packages:
             self.compact_markers(dep_package.dependency)
             # Freeze extra markers for dependencies which were pulled in via extras
             # Don't freeze markers if a dependency is also part of the base
@@ -261,7 +263,7 @@ def get_frozen_deps(self, dep_packages, exclude_packages=None):
                 lines.append(requirement)
                 continue
 
-            require_dist = "%s (==%s)" % (pkg_name, dep_package.package.version)
+            require_dist = "%s (==%s)" % (dep_package.package.name, dep_package.package.version)
             if ";" in requirement:
                 markers = requirement.split(";", 1)[1].strip()
                 require_dist += f" ; {markers}"
@@ -283,7 +285,6 @@ def replace_deps(self, dist_meta, dep_lines):
 
     def get_path_deps(self, group="dev"):
         # assuming we're consistent install across deps.
-        package_deps = {}
         group = self.poetry.package.dependency_group(group)
         for dep in group.dependencies:
             if not (dep.is_file() or dep.is_directory()):
@@ -296,8 +297,7 @@ def get_path_deps(self, group="dev"):
             iced_dep = iced.poetry.package.to_dependency()
             iced_dep.marker = MultiMarker(dep.marker, iced_dep.marker)
             package_dep = DependencyPackage(dependency=iced_dep, package=iced.poetry.package)
-            package_deps[dep.name] = package_dep
-        return package_deps
+            yield package_dep
 
     def freeze_record(self, records_fh, dist_meta, md_path):
         hash_digest = get_sha256_digest(str(dist_meta).encode("utf8"))
@@ -330,9 +330,8 @@ def freeze_wheel(self, wheel_path, dep_packages):
             # freeze deps in metadata and update records
             md_text = source_whl.open(md_path).read().decode("utf8")
             dist_meta = Parser().parsestr(md_text)
-            deps = self.get_path_deps(MAIN_GROUP)
-            deps.update(dep_packages)
-            dep_lines = self.get_frozen_deps(deps, self.exclude_packages)
+            path_deps = self.get_path_deps(MAIN_GROUP)
+            dep_lines = self.get_frozen_deps(chain(path_deps, dep_packages), self.exclude_packages)
             if dep_lines:
                 self.replace_deps(dist_meta, dep_lines)
 

tests/fixtures/nested_packages/others/app_c/dist/app_c-0.2-py3-none-any.whl

@@ -11,6 +11,10 @@ packages = [
 python = "^3.10"
 pytest = "^7.1"
 pytest-cov = "^4.0"
+urllib3 = [
+    { version = "<2", python = "<3.11" },
+    { version = "*", python = ">=3.11" }
+]
 
 [tool.poetry.group.dev.dependencies]
 app_b = {path = "../..", develop = true}

tests/fixtures/nested_packages/others/app_c/poetry.lock

@@ -91,16 +91,19 @@ def test_freeze_nested(fixture_root, fixture_copy):
     )
 
     expected_headers = [
-        ("Metadata-Version", "2.1"),
-        ("Name", "app-c"),
+        ("Metadata-Version", "2.3"),
+        ("Name", "app_c"),
         ("Version", "0.2"),
         ("Summary", "lorem ipsum"),
         ("License", "Apache-2.0"),
         ("Author", "SideCars"),
-        ("Requires-Python", ">=3.11,<4.0"),
+        ("Requires-Python", ">=3.10,<4.0"),
         ("Classifier", "License :: OSI Approved :: Apache Software License"),
         ("Classifier", "Programming Language :: Python :: 3"),
+        ("Classifier", "Programming Language :: Python :: 3.10"),
         ("Classifier", "Programming Language :: Python :: 3.11"),
+        ("Classifier", "Programming Language :: Python :: 3.12"),
+        ("Classifier", "Programming Language :: Python :: 3.13"),
         (
             "Requires-Dist",
             'pytest (==7.2.2) ; python_version >= "3.10" and python_version < "4.0"',
@@ -134,6 +137,14 @@ def test_freeze_nested(fixture_root, fixture_copy):
             "Requires-Dist",
             'tomli (==2.0.1) ; python_version >= "3.10" and python_full_version <= ' '"3.11.0a6"',
         ),
+        (
+            "Requires-Dist",
+            'urllib3 (==1.26.20) ; python_version >= "3.10" and python_version < "3.11"',
+        ),
+        (
+            "Requires-Dist",
+            'urllib3 (==2.3.0) ; python_version >= "3.11" and python_version < "4.0"',
+        ),
         (
             "Requires-Dist",
             'pytest-cov (==4.0.0) ; python_version >= "3.10" and python_version < "4.0"',
@@ -153,20 +164,20 @@ def test_freeze_nested(fixture_root, fixture_copy):
         ],
         [
             "app_c-0.2.dist-info/WHEEL",
-            "sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y",
+            "sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM",
             "88",
         ],
         ["app_c-0.2.dist-info/RECORD", "", ""],
         [
             "app_c-0.2.dist-info/METADATA",
-            "sha256=ZTdp4AJVW1WFj_Wv5oUVdtUC1_5r9bYWNxDzssJgO6o",
-            "1217",
+            "sha256=Y0clowJC222mCfG3SHng-M--m9e9Xz9CHRVarGNDlcY",
+            "1547",
         ],
     ]
 
     md_bytes = wheel.open(f"{iced_sub.distro_name}-{iced_sub.version}.dist-info/METADATA").read()
-    assert len(md_bytes) == 1217
-    assert get_sha256_digest(md_bytes) == "ZTdp4AJVW1WFj_Wv5oUVdtUC1_5r9bYWNxDzssJgO6o"
+    assert len(md_bytes) == 1547
+    assert get_sha256_digest(md_bytes) == "Y0clowJC222mCfG3SHng-M--m9e9Xz9CHRVarGNDlcY"
 
 
 def test_freeze_no_deps(fixture_root, fixture_copy):