gh-131261: expat/refresh.sh: Expand list of manual steps (GH-131359)

encukou · encukou · commit dc73ce358bab · 2026-02-05T14:18:53.000+01:00
This backports commit: 51d3099
diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json
diff --git a/Modules/expat/refresh.sh b/Modules/expat/refresh.sh
@@ -57,4 +57,13 @@ rm libexpat.tar.gz
 # Step 3: Add the namespacing include to expat_external.h
 sed -i 's/#  define Expat_External_INCLUDED 1/&\n\/* Namespace external symbols to allow multiple libexpat version to\n   co-exist. \*\/\n#include "pyexpatns.h"/' expat_external.h
 
-echo "Updated; verify all is okay using git diff and git status."
+echo "
+Updated! next steps:
+- Verify all is okay:
+    git diff
+    git status
+- Regenerate the sbom file
+    make regen-sbom
+- Update warning count in Tools/build/.warningignore_macos
+    (use info from CI if not on a Mac)
+"
diff --git a/Tools/build/generate_sbom.py b/Tools/build/generate_sbom.py
@@ -64,7 +64,7 @@ class PackageFiles(typing.NamedTuple):
         exclude=[
             "Modules/expat/expat_config.h",
             "Modules/expat/pyexpatns.h",
-            "Modules/_hacl/refresh.sh",
+            "Modules/expat/refresh.sh",
         ]
     ),
     "macholib": PackageFiles(

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class PackageFiles(typing.NamedTuple):`
`64`	`64`	`exclude=[`
`65`	`65`	`"Modules/expat/expat_config.h",`
`66`	`66`	`"Modules/expat/pyexpatns.h",`
`67`		`- "Modules/_hacl/refresh.sh",`
	`67`	`+ "Modules/expat/refresh.sh",`
`68`	`68`	`]`
`69`	`69`	`),`
`70`	`70`	`"macholib": PackageFiles(`