From 3b5371076075766a1187552956bff3a4866d7f57 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Wed, 12 Feb 2025 13:18:02 -0600 Subject: [PATCH 1/3] Add support for PEP 770 --- src/validate_pyproject/project_metadata.schema.json | 8 ++++++++ tests/examples/simple/pep770.toml | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 tests/examples/simple/pep770.toml diff --git a/src/validate_pyproject/project_metadata.schema.json b/src/validate_pyproject/project_metadata.schema.json index 00c3d03e..fdb51f6a 100644 --- a/src/validate_pyproject/project_metadata.schema.json +++ b/src/validate_pyproject/project_metadata.schema.json @@ -144,6 +144,13 @@ "type": "string" } }, + "sbom-files": { + "description": "Paths or globs to paths of Software Bill-of-Materials files", + "type": "array", + "items": { + "type": "string" + } + }, "authors": { "type": "array", "items": {"$ref": "#/definitions/author"}, @@ -247,6 +254,7 @@ "requires-python", "license", "license-files", + "sbom-files", "authors", "maintainers", "keywords", diff --git a/tests/examples/simple/pep770.toml b/tests/examples/simple/pep770.toml new file mode 100644 index 00000000..9f95827f --- /dev/null +++ b/tests/examples/simple/pep770.toml @@ -0,0 +1,5 @@ +[project] +name = "example" +version = "1.2.3" +sbom-files = ["sboms/bom.cdx.json", "sboms/*"] + From 8cecbaa05d89b81c19ff02e83bf16677880d9004 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 19:20:54 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/examples/simple/pep770.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/examples/simple/pep770.toml b/tests/examples/simple/pep770.toml index 9f95827f..50499706 100644 --- a/tests/examples/simple/pep770.toml +++ b/tests/examples/simple/pep770.toml @@ -2,4 +2,3 @@ name = "example" version = "1.2.3" sbom-files = ["sboms/bom.cdx.json", "sboms/*"] - From b632a30777f124704e30e0135050bfe56db242ae Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Wed, 12 Feb 2025 15:44:27 -0600 Subject: [PATCH 3/3] Add an invalid example --- tests/invalid-examples/pep621/pep770/pep770-string.errors.txt | 1 + tests/invalid-examples/pep621/pep770/pep770-string.toml | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 tests/invalid-examples/pep621/pep770/pep770-string.errors.txt create mode 100644 tests/invalid-examples/pep621/pep770/pep770-string.toml diff --git a/tests/invalid-examples/pep621/pep770/pep770-string.errors.txt b/tests/invalid-examples/pep621/pep770/pep770-string.errors.txt new file mode 100644 index 00000000..e421b7d1 --- /dev/null +++ b/tests/invalid-examples/pep621/pep770/pep770-string.errors.txt @@ -0,0 +1 @@ +`project.sbom-files` must be array diff --git a/tests/invalid-examples/pep621/pep770/pep770-string.toml b/tests/invalid-examples/pep621/pep770/pep770-string.toml new file mode 100644 index 00000000..4a06197c --- /dev/null +++ b/tests/invalid-examples/pep621/pep770/pep770-string.toml @@ -0,0 +1,4 @@ +[project] +name = "example" +version = "1.2.3" +sbom-files = "sboms/bom.cdx.json"