Merge pull request #229 from frenzymadness/poetry2reqs

Poetry2reqs

Author: sesheta

micropipenv.py

@@ -752,7 +752,8 @@ def _poetry2pipfile_lock(
     if only_direct:
         if not no_default:
             for dependency_name, info in pyproject_poetry_section.get("dependencies", {}).items():
-                default[dependency_name] = _translate_poetry_dependency(info)
+                if dependency_name != "python":
+                    default[dependency_name] = _translate_poetry_dependency(info)
 
         if not no_dev:
             for dependency_name, info in pyproject_poetry_section.get("dev-dependencies", {}).items():
@@ -771,8 +772,16 @@ def _poetry2pipfile_lock(
 
     additional_markers = defaultdict(list)
     skip_all_markers = object()
+    add_to_dev = list()
 
     for entry in poetry_lock["package"]:
+
+        if entry["category"] not in ("dev", "main"):
+            message = ("Unknown category for package '{}': '{}'. Supported categories are 'dev' and 'main'.").format(
+                entry["name"], entry["category"]
+            )
+            raise PoetryError(message)
+
         hashes = []
         for file_entry in poetry_lock["metadata"]["files"][entry["name"]]:
             hashes.append(file_entry["hash"])
@@ -826,6 +835,24 @@ def _poetry2pipfile_lock(
                 else:
                     additional_markers[normalize_package_name(dependency_name)].append(skip_all_markers)
 
+            # If package fits into both main and dev categories, poetry add it to the main one.
+            # This might be a problem in the following scenario:
+            # Let's say our project looks like this:
+            # dependencies:
+            # - A
+            # dev-dependencies:
+            # - B
+            #   - A (A is also a dependency of B)
+            # Package A is therefore in the main category so if we use "--do-default" we get
+            # only package B but no package A. But using requirements file requires to have
+            # all dependencies with their hashes and pinned versions.
+            # So, if a package is in dev and has a dependency in main, add the dependency also to dev or
+            # if a package is already in "add_to_dev", add there also all its dependencies.
+            if (
+                entry["category"] == "dev" and dependency_name in pyproject_poetry_section.get("dependencies", ())
+            ) or entry["name"] in add_to_dev:
+                add_to_dev.append(dependency_name)
+
         for extra_name, extras_listed in entry.get("extras", {}).items():
             # Turn requirement specification into the actual requirement name.
             all_extra_dependencies = set(Requirement(r.split(" ", maxsplit=1)[0]).name for r in extras_listed)
@@ -839,14 +866,13 @@ def _poetry2pipfile_lock(
         if "extras" in requirement:
             requirement["extras"] = sorted(requirement["extras"])
 
-        if entry["category"] == "main":
-            if not no_default:
-                default[entry["name"]] = requirement
-        elif entry["category"] == "dev":
-            if not no_dev:
-                develop[entry["name"]] = requirement
-        else:
-            raise PoetryError("Unknown category for package {}: {}".format(entry["name"], entry["category"]))
+        if entry["category"] == "main" and not no_default:
+            default[entry["name"]] = requirement
+
+        if (entry["category"] == "dev" and not no_dev) or (
+            entry["name"] in add_to_dev and entry["name"] not in default
+        ):
+            develop[entry["name"]] = requirement
 
     for dependency_name, markers in additional_markers.items():
         # If a package depends on another package unconditionaly
@@ -1069,8 +1095,11 @@ def get_requirements_sections(
 
 def _get_package_entry_str(
     package_name, info, *, no_hashes=False, no_versions=False
-):  # type: (str, Dict[str, Any], bool, bool) -> str
+):  # type: (str, Union[Dict[str, Any], str], bool, bool) -> str
     """Print entry for the given package."""
+    if isinstance(info, str):
+        return package_name + info + "\n"
+
     if "git" in info:  # A special case for a VCS package
         if info.get("editable", False):
             result = "--editable git+{}".format(info["git"])

tests/data/parse/poetry_invalid_category/poetry.lock

@@ -0,0 +1,15 @@
+[tool.poetry]
+name = "aaa"
+version = "0.1.0"
+description = ""
+authors = ["Fridolin Pokorny <fridolin@redhat.com>"]
+
+[tool.poetry.dependencies]
+daiquiri = "2.0.0"
+
+[tool.poetry.dev-dependencies]
+flexmock = "^0.10.4"
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"

tests/data/parse/poetry_invalid_category/pyproject.toml

@@ -0,0 +1,18 @@
+[tool.poetry]
+name = "test"
+version = "1.0.0"
+description = ""
+authors = ["Your Name <you@example.com>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+python-dateutil = "2.8.1"
+
+[tool.poetry.dev-dependencies]
+freezegun = "1.1.0"
+python-dateutil = "2.8.1"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

tests/data/requirements/poetry_complex/poetry.lock

@@ -0,0 +1,9 @@
+python-dateutil==2.8.1 \
+    --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \
+    --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a
+six==1.16.0 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+freezegun==1.1.0 \
+    --hash=sha256:2ae695f7eb96c62529f03a038461afe3c692db3465e215355e1bb4b0ab408712 \
+    --hash=sha256:177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3

tests/data/requirements/poetry_complex/pyproject.toml

@@ -0,0 +1,12 @@
+#
+# Dev dependencies
+#
+freezegun==1.1.0 \
+    --hash=sha256:2ae695f7eb96c62529f03a038461afe3c692db3465e215355e1bb4b0ab408712 \
+    --hash=sha256:177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3
+python-dateutil==2.8.1 \
+    --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \
+    --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a
+six==1.16.0 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926

tests/data/requirements/poetry_complex/requirements_no_comments.txt

@@ -0,0 +1,9 @@
+#
+# Default dependencies
+#
+python-dateutil==2.8.1 \
+    --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \
+    --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a
+six==1.16.0 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926

tests/data/requirements/poetry_complex/requirements_no_default.txt

@@ -0,0 +1,9 @@
+#
+# Default dependencies
+#
+python-dateutil==2.8.1
+six==1.16.0
+#
+# Dev dependencies
+#
+freezegun==1.1.0

tests/data/requirements/poetry_complex/requirements_no_dev.txt

@@ -0,0 +1,15 @@
+#
+# Default dependencies
+#
+python-dateutil==2.8.1 \
+    --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \
+    --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a
+six==1.16.0 \
+    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
+    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
+#
+# Dev dependencies
+#
+freezegun==1.1.0 \
+    --hash=sha256:2ae695f7eb96c62529f03a038461afe3c692db3465e215355e1bb4b0ab408712 \
+    --hash=sha256:177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3