Merge pull request #406 from shubhbapna/remove-type-from-build-order

fix: remove type from build-order

Author: mergify[bot]

e2e/test_report_missing_dependency.sh

@@ -18,11 +18,11 @@ fromager \
   bootstrap "${DIST}==${VERSION}"
 
 # Extract the build dependencies from the bootstrap info.
-jq -r '.[] | select( .type | contains("build-") ) | .req'  \
-   "$OUTDIR/work-dir/build-order.json" > "$OUTDIR/expected_build_requirements.txt"
+jq -r '.[] | .edges | .[] | select( .req_type | contains("build-") ) | .req'  \
+   "$OUTDIR/work-dir/graph.json" > "$OUTDIR/expected_build_requirements.txt"
 
 # Remove all of the build dependencies from the wheels-repo.
-jq -r '.[] | select( .type | contains("build-") ) | .dist'  "$OUTDIR/work-dir/build-order.json" \
+jq -r '.[] | .edges | .[] | select( .req_type | contains("build-") ) | .key | split("==")[0]'  "$OUTDIR/work-dir/graph.json" \
   | while read -r to_remove; do
   echo "Removing build dependency ${to_remove}"
   rm -f "$OUTDIR/wheels-repo/downloads/${to_remove}"*

src/fromager/context.py

@@ -14,7 +14,6 @@
     constraints,
     dependency_graph,
     packagesettings,
-    requirements_file,
 )
 
 logger = logging.getLogger(__name__)
@@ -118,7 +117,6 @@ def has_been_seen(self, req: Requirement, version: Version) -> bool:
 
     def add_to_build_order(
         self,
-        req_type: requirements_file.RequirementType,
         req: Requirement,
         version: Version,
         source_url: str,
@@ -137,7 +135,6 @@ def add_to_build_order(
         logger.info(f"{req.name}: adding {key} to build order")
         self._build_requirements.add(key)
         info = {
-            "type": str(req_type),
             "req": str(req),
             "constraint": str(constraint) if constraint else "",
             "dist": canonicalize_name(req.name),

src/fromager/sdist.py

@@ -159,7 +159,6 @@ def handle_requirement(
     # build it so we have a record of the dependency even if the build
     # fails.
     ctx.add_to_build_order(
-        req_type=req_type,
         req=req,
         version=resolved_version,
         source_url=source_url,

tests/test_context.py

@@ -37,14 +37,12 @@ def test_seen_name_canonicalization(tmp_context):
 
 def test_build_order(tmp_context):
     tmp_context.add_to_build_order(
-        req_type="build_backend",
         req=Requirement("buildme>1.0"),
         version="6.0",
         source_url="url",
         source_url_type="sdist",
     )
     tmp_context.add_to_build_order(
-        req_type="dependency",
         req=Requirement("testdist>1.0"),
         version="1.2",
         source_url="url",
@@ -54,7 +52,6 @@ def test_build_order(tmp_context):
     contents = json.loads(contents_str)
     expected = [
         {
-            "type": "build_backend",
             "req": "buildme>1.0",
             "dist": "buildme",
             "version": "6.0",
@@ -64,7 +61,6 @@ def test_build_order(tmp_context):
             "constraint": "",
         },
         {
-            "type": "dependency",
             "req": "testdist>1.0",
             "dist": "testdist",
             "version": "1.2",
@@ -79,21 +75,18 @@ def test_build_order(tmp_context):
 
 def test_build_order_repeats(tmp_context):
     tmp_context.add_to_build_order(
-        "build_backend",
         Requirement("buildme>1.0"),
         "6.0",
         "url",
         "sdist",
     )
     tmp_context.add_to_build_order(
-        "build_backend",
         Requirement("buildme>1.0"),
         "6.0",
         "url",
         "sdist",
     )
     tmp_context.add_to_build_order(
-        "build_backend",
         Requirement("buildme[extra]>1.0"),
         "6.0",
         "url",
@@ -103,7 +96,6 @@ def test_build_order_repeats(tmp_context):
     contents = json.loads(contents_str)
     expected = [
         {
-            "type": "build_backend",
             "req": "buildme>1.0",
             "dist": "buildme",
             "version": "6.0",
@@ -118,14 +110,12 @@ def test_build_order_repeats(tmp_context):
 
 def test_build_order_name_canonicalization(tmp_context):
     tmp_context.add_to_build_order(
-        "build_backend",
         Requirement("flit-core>1.0"),
         "3.9.0",
         "url",
         "sdist",
     )
     tmp_context.add_to_build_order(
-        "build_backend",
         Requirement("flit_core>1.0"),
         "3.9.0",
         "url",
@@ -135,7 +125,6 @@ def test_build_order_name_canonicalization(tmp_context):
     contents = json.loads(contents_str)
     expected = [
         {
-            "type": "build_backend",
             "req": "flit-core>1.0",
             "dist": "flit-core",
             "version": "3.9.0",