https://github.com/python/cpython/commit/51d309988b3041cae20cca89172b4fd825c9a1cc
commit: 51d309988b3041cae20cca89172b4fd825c9a1cc
branch: main
author: Petr Viktorin <encu...@gmail.com>
committer: encukou <encu...@gmail.com>
date: 2025-03-18T13:17:43+01:00
summary:
gh-131261: expat/refresh.sh: Expand list of manual steps (GH-131359)
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 cac346f8c38eaf..617c631c357db2 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": "1834a0629524eee116cf84251464fb368423fd73"
- },
- {
- "algorithm": "SHA256",
- "checksumValue":
"a8e123d64c0c43fcc52e70c6573db071c3d007ecdad604fbc3a84beefe2ed3a1"
- }
- ],
- "fileName": "Modules/expat/refresh.sh"
- },
{
"SPDXID": "SPDXRef-FILE-Modules-expat-siphash.h",
"checksums": [
@@ -1776,11 +1762,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 ca1c1bdfebfefd..46e236cbb5542b 100755
--- a/Modules/expat/refresh.sh
+++ b/Modules/expat/refresh.sh
@@ -54,4 +54,13 @@ rm libexpat.tar.gz
# Step 3: Add the namespacing include to expat_external.h
sed -i 's/#define Expat_External_INCLUDED 1/&\n\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
index 5c4a725102d79a..073c26ed13ce0a 100644
--- a/Tools/build/generate_sbom.py
+++ b/Tools/build/generate_sbom.py
@@ -60,7 +60,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 -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
