Implement support for poetry 2.0

micropipenv.py

@@ -307,18 +307,37 @@ def _compute_pipfile_hash(pipfile):  # type: (Dict[str, Any]) -> str
 
 def _compute_poetry_hash(pyproject):  # type: (MutableMapping[str, Any]) -> str
     """Compute pyproject.toml hash based on poetry content."""
-    poetry_data = pyproject["tool"]["poetry"]
-    relevant_keys = ["dependencies", "dev-dependencies", "source", "extras"]
-    relevant_content = {key: poetry_data.get(key) for key in relevant_keys}
+    project_data = pyproject.get("project", {})
+    poetry_data = pyproject.get("tool", {}).get("poetry", {})
 
-    # relevant_keys are the original one and they should always be in
-    # the relevant_content even their value is None.
-    # group is a new key since poetry 1.2 and we should include it only
+    # legacy_keys are the original (pre poetry 2) concept, and should be in
+    # the relevant_content even if their value is None as long as it is not a poetry 2 config.
+    legacy_keys = ["dependencies", "source", "extras", "dev-dependencies"]
+    # group is a new key since poetry 1.2, and must be included
     # if pyproject.toml contains it. Including it always would break
     # backward compatibility.
     # See: https://github.com/python-poetry/poetry/blob/4a07b5e0243bb8879dd6725cb901d9fa0f6eb182/src/poetry/packages/locker.py#L278-L293
-    if "group" in poetry_data:
-        relevant_content["group"] = poetry_data.get("group")
+    relevant_keys = [*legacy_keys, "group"]
+    relevant_project_keys = ["requires-python", "dependencies", "optional-dependencies"]
+
+    relevant_project_content = {k: project_data[k] for k in relevant_project_keys if project_data.get(k)}
+    relevant_poetry_content = {}
+    for key in relevant_keys:
+        value = poetry_data.get(key)
+        # Set legacy keys as None for backwards compatibility to older poetry configs
+        if not value and (key not in legacy_keys or relevant_project_content):
+            continue
+        relevant_poetry_content[key] = value
+
+    relevant_content = relevant_poetry_content
+    if relevant_project_content:
+        # project is introduced as the new format in poetry 2.0 and must be used when configured.
+        # Always using the new format would break backward compatibility.
+        # See: https://github.com/python-poetry/poetry/blob/6f6fd7012983a2e749c6030c1f5f155fd4397058/src/poetry/packages/locker.py#L266-L302
+        relevant_content = {
+            "project": relevant_project_content,
+            "tool": {"poetry": relevant_content},
+        }
 
     return hashlib.sha256(json.dumps(relevant_content, sort_keys=True).encode()).hexdigest()
 

tests/data/verify/poetry_2_project/pyproject.toml

@@ -0,0 +1,20 @@
+[project]
+name = "micropipenv-test"
+version = "0.1.0"
+description = ""
+authors = [
+    { name = "Fridolin Pokorny", "email" = "[email protected]" }
+]
+dynamic = [ "dependencies" ]
+requires-python = "^3.7"
+
+[tool.poetry.dependencies]
+python = "^3.7"
+daiquiri = "2.0.0"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "^6"
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"

tests/test_micropipenv.py

@@ -1300,7 +1300,7 @@ def test_get_package_entry_str(info, expected):
     assert result == expected
 
 
-@pytest.mark.parametrize("path", ["poetry", "poetry_group"])
+@pytest.mark.parametrize("path", ["poetry", "poetry_group", "poetry_2_project"])
 def test_poetry_lockfile_verify(path):
     """Test verifying poetry lockfile."""
     with cwd(os.path.join(_DATA_DIR, "verify", path)):