Add pip to SBOM at release stage - #96
Merged
sethmlarson merged 2 commits intoFeb 12, 2024
Merged
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
sethmlarson
commented
Feb 9, 2024
Comment thread
sbom.py
| raise ValueError(f"Couldn't fetch metadata for project '{project}' from PyPI: {e}") | ||
|
|
||
|
|
||
| def remove_pip_from_sbom(sbom_data: dict[str, typing.Any]) -> None: |
Copy link
Copy Markdown
Collaborator
Author
There was a problem hiding this comment.
I'll be able to remove this function once I remove pip from the SBOM in the CPython source code.
Sorry, something went wrong.
sethmlarson
commented
Feb 9, 2024
Comment thread
sbom.py
| "Tarball doesn't contain an SBOM at 'Misc/sbom.spdx.json'" | ||
| ) from None | ||
| sbom_bytes = tarball.extractfile(sbom_tarball_member).read() | ||
| sbom_data = json.loads(sbom_bytes) |
Copy link
Copy Markdown
Collaborator
Author
There was a problem hiding this comment.
Changed this variable name to match everywhere in this script.
Sorry, something went wrong.
ezio-melotti
reviewed
Feb 9, 2024
Comment thread
tests/test_sbom.py
Outdated
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
hugovk
approved these changes
Feb 10, 2024
hugovk
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
There will be a follow-up PR to the CPython repository removing the machinery there once this PR lands.
And after that update https://devguide.python.org/developer-workflow/sbom/.
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #91 This moves the pip SBOM discovery machinery from the CPython repository to this repository to not require pip maintainers to update the SBOM every time, saving difficulties with backporting and a bunch of manual effort.
There will be a follow-up PR to the CPython repository removing the machinery there once this PR lands.
The SBOM diff between running this script on Python-3.12.2.tgz:
Notice this removes all the direct relationships between CPython and pip's subpackages, this is a good thing IMO since CPython doesn't directly depend on these packages. This still lets tools like scanners discover vulnerabilities because CPython still has a dependency relationship with pip.