Merge pull request #783 from python-wheel-build/fix-always-showing-skipped

fix(build): correct skipped status in build-sequence-summary.json

Author: mergify[bot]

e2e/test_build_order.sh

@@ -66,6 +66,23 @@ for pattern in $EXPECTED_FILES; do
   fi
 done
 
+# Verify that build-sequence-summary.json has correct skipped status for force builds
+# When using --force, all packages should be built (skipped: false)
+if [ -f "$OUTDIR/work-dir/build-sequence-summary.json" ]; then
+  # Check that all entries have skipped: false
+  not_skipped_count=$(jq '[.[] | select(.skipped == false)] | length' "$OUTDIR/work-dir/build-sequence-summary.json")
+  total_count=$(jq 'length' "$OUTDIR/work-dir/build-sequence-summary.json")
+  if [ "$not_skipped_count" != "$total_count" ]; then
+    echo "Expected all $total_count packages to be built (not skipped), but only $not_skipped_count were marked as not skipped" 1>&2
+    echo "Contents of build-sequence-summary.json:" 1>&2
+    jq '.' "$OUTDIR/work-dir/build-sequence-summary.json" 1>&2
+    pass=false
+  fi
+else
+  echo "build-sequence-summary.json file not found after force build" 1>&2
+  pass=false
+fi
+
 $pass
 
 # Rebuild everything while reusing existing local wheels
@@ -114,4 +131,21 @@ if ! grep -q "skipping building wheel since ${DIST}-${VERSION}-" "$log"; then
   pass=false
 fi
 
+# Verify that build-sequence-summary.json has correct skipped status
+# When using --cache-wheel-server-url with PyPI, all packages should be skipped
+if [ -f "$OUTDIR/work-dir/build-sequence-summary.json" ]; then
+  # Check that all entries have skipped: true
+  skipped_count=$(jq '[.[] | select(.skipped == true)] | length' "$OUTDIR/work-dir/build-sequence-summary.json")
+  total_count=$(jq 'length' "$OUTDIR/work-dir/build-sequence-summary.json")
+  if [ "$skipped_count" != "$total_count" ]; then
+    echo "Expected all $total_count packages to be skipped, but only $skipped_count were marked as skipped" 1>&2
+    echo "Contents of build-sequence-summary.json:" 1>&2
+    jq '.' "$OUTDIR/work-dir/build-sequence-summary.json" 1>&2
+    pass=false
+  fi
+else
+  echo "build-sequence-summary.json file not found" 1>&2
+  pass=false
+fi
+
 $pass

src/fromager/commands/build.py

@@ -363,22 +363,21 @@ def _build(
             logger.info("using existing wheel from %s", wheel_filename)
             use_exiting_wheel = True
 
-    # See if we can download a prebuilt wheel.
-    if prebuilt and not wheel_filename:
-        logger.info("downloading prebuilt wheel")
-        wheel_filename = wheels.download_wheel(
-            req=req,
-            wheel_url=source_download_url,
-            output_directory=wkctx.wheels_build,
-        )
-    else:
-        # already downloaded
-        use_exiting_wheel = True
+    # Handle prebuilt wheels.
+    if prebuilt:
+        if not wheel_filename:
+            logger.info("downloading prebuilt wheel")
+            wheel_filename = wheels.download_wheel(
+                req=req,
+                wheel_url=source_download_url,
+                output_directory=wkctx.wheels_build,
+            )
+        else:
+            # already downloaded prebuilt wheel
+            use_exiting_wheel = True
 
-    # We may have downloaded the prebuilt wheel in _is_wheel_built or
-    # via download_wheel(). Regardless, if it was a prebuilt wheel,
-    # run the hooks.
-    if prebuilt and wheel_filename:
+        # Run hooks for prebuilt wheels. At this point wheel_filename should
+        # be set either from _is_wheel_built() or download_wheel().
         hooks.run_prebuilt_wheel_hooks(
             ctx=wkctx,
             req=req,