feat: build tool detected by macaron will be used now and build dependancy information supplied to those build tools will be better extracted

Signed-off-by: Abhinav Pradeep <abhinav.pradeep@oracle.com>

Author: AbhinavPradeep

src/macaron/build_spec_generator/common_spec/pypi_spec.py

@@ -67,15 +67,20 @@ def get_default_build_commands(
 
             match build_tool_name:
                 case "pip":
-                    default_build_commands.append("python -m build".split())
+                    default_build_commands.append("python -m build --wheel -n".split())
                 case "poetry":
-                    default_build_commands.append("poetry build".split())
+                    default_build_commands.append("pip install poetry && poetry build".split())
                 case "flit":
-                    default_build_commands.append("flit build".split())
+                    # We might also want to deal with existence flit.ini, we can do so via
+                    # "python -m flit.tomlify"
+                    default_build_commands.append(
+                        'pip install flit && if test -f "flit.ini"; then python -m flit.tomlify; fi '
+                        "&& flit build".split()
+                    )
                 case "hatch":
-                    default_build_commands.append("hatch build".split())
+                    default_build_commands.append("pip install hatch && hatch build".split())
                 case "conda":
-                    default_build_commands.append("conda build".split())
+                    default_build_commands.append('echo("Not supported")'.split())
                 case _:
                     pass
 
@@ -156,18 +161,35 @@ def resolve_fields(self, purl: PackageURL) -> None:
                 try:
                     with pypi_package_json.sourcecode():
                         try:
+                            # Get the build time requirements from ["build-system", "requires"]
                             pyproject_content = pypi_package_json.get_sourcecode_file_contents("pyproject.toml")
                             content = tomli.loads(pyproject_content.decode("utf-8"))
                             requires = json_extract(content, ["build-system", "requires"], list)
                             if requires:
                                 build_requires_set.update(elem.replace(" ", "") for elem in requires)
+                            # If we have hatch as a build_tool, we will
+                            if "hatch" in self.data["build_tools"]:
+                                # Look for [tool.hatch.build.hooks.*]
+                                hatch_build_hooks = json_extract(content, ["tool", "hatch", "build", "hooks"], dict)
+                                if hatch_build_hooks:
+                                    for _, section in hatch_build_hooks.items():
+                                        dependencies = section.get("dependencies")
+                                        if dependencies:
+                                            build_requires_set.update(elem.replace(" ", "") for elem in dependencies)
                             backend = json_extract(content, ["build-system", "build-backend"], str)
                             if backend:
                                 build_backends_set.add(backend.replace(" ", ""))
-
                             python_version_constraint = json_extract(content, ["project", "requires-python"], str)
                             if python_version_constraint:
                                 python_version_set.add(python_version_constraint.replace(" ", ""))
+                            # If we have flit as a build_tool, we will check if the legacy header [tool.flit.metadata] exists,
+                            # and if so, check to see if we can use its "requires-python".
+                            if "flit" in self.data["build_tools"]:
+                                flit_python_version_constraint = json_extract(
+                                    content, ["tool", "flit", "metadata", "requires-python"], str
+                                )
+                                if flit_python_version_constraint:
+                                    python_version_set.add(flit_python_version_constraint.replace(" ", ""))
                             logger.debug(
                                 "After analyzing pyproject.toml from the sdist: build-requires: %s, build_backend: %s",
                                 build_requires_set,

src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py

@@ -87,7 +87,7 @@ def gen_dockerfile(buildspec: BaseBuildSpecDict) -> str:
     EOF
 
     # Run the build
-    RUN /deps/bin/python -m build --wheel -n
+    RUN {"source /deps/bin/activate && " + " ".join(x for x in buildspec["build_commands"][0])}
     """
 
     return dedent(dockerfile_content)

tests/build_spec_generator/dockerfile/__snapshots__/test_pypi_dockerfile_output.ambr

@@ -50,7 +50,7 @@
   EOF
 
   # Run the build
-  RUN /deps/bin/python -m build --wheel -n
+  RUN source /deps/bin/activate && python -m build
 
   '''
 # ---

tests/integration/cases/pypi_markdown-it-py/expected_default.buildspec

@@ -17,6 +17,20 @@
     ],
     "build_commands": [
         [
+            "pip",
+            "install",
+            "flit",
+            "&&",
+            "if",
+            "test",
+            "-f",
+            "\"flit.ini\";",
+            "then",
+            "python",
+            "-m",
+            "flit.tomlify;",
+            "fi",
+            "&&",
             "flit",
             "build"
         ]

tests/integration/cases/pypi_toga/expected_default.buildspec

@@ -19,7 +19,9 @@
         [
             "python",
             "-m",
-            "build"
+            "build",
+            "--wheel",
+            "-n"
         ]
     ],
     "build_requires": {