https://github.com/python/cpython/commit/bad4bc4603fea4541b9e3db45b4050104e461c0a
commit: bad4bc4603fea4541b9e3db45b4050104e461c0a
branch: 3.13
author: Petr Viktorin <[email protected]>
committer: encukou <[email protected]>
date: 2026-02-10T10:49:00+01:00
summary:
[3.13] gh-131261: generate_sbom.py: Exclude the refresh script from SBOM
(GH-131359) (GH-144625)
- generate_sbom.py: Exclude the refresh script from SBOM
- Modules/expat/refresh.sh: Expand the list of manual steps
(cherry picked from commit 51d309988b3041cae20cca89172b4fd825c9a1cc)
files:
M Misc/sbom.spdx.json
M Modules/expat/refresh.sh
M Tools/build/generate_sbom.py
diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json
index 7b0976df65fe3d..e40dcc140c6008 100644
--- a/Misc/sbom.spdx.json
+++ b/Misc/sbom.spdx.json
@@ -127,20 +127,6 @@
],
"fileName": "Modules/expat/nametab.h"
},
- {
- "SPDXID": "SPDXRef-FILE-Modules-expat-refresh.sh",
- "checksums": [
- {
- "algorithm": "SHA1",
- "checksumValue": "32a10fbb8027cea3134674912b896abca516b085"
- },
- {
- "algorithm": "SHA256",
- "checksumValue":
"51d08c697d1e409f5ce0749c1a136a0e1618d3069cf544d86005f966f43a8f97"
- }
- ],
- "fileName": "Modules/expat/refresh.sh"
- },
{
"SPDXID": "SPDXRef-FILE-Modules-expat-siphash.h",
"checksums": [
@@ -1714,11 +1700,6 @@
"relationshipType": "CONTAINS",
"spdxElementId": "SPDXRef-PACKAGE-expat"
},
- {
- "relatedSpdxElement": "SPDXRef-FILE-Modules-expat-refresh.sh",
- "relationshipType": "CONTAINS",
- "spdxElementId": "SPDXRef-PACKAGE-expat"
- },
{
"relatedSpdxElement": "SPDXRef-FILE-Modules-expat-siphash.h",
"relationshipType": "CONTAINS",
diff --git a/Modules/expat/refresh.sh b/Modules/expat/refresh.sh
index a8cca16a7a41f5..6564e82d2d3716 100755
--- a/Modules/expat/refresh.sh
+++ b/Modules/expat/refresh.sh
@@ -54,4 +54,11 @@ 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
+"
diff --git a/Tools/build/generate_sbom.py b/Tools/build/generate_sbom.py
index 10391ab48ad067..f8ddebf84a00b1 100644
--- 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(
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
