Skip to content

Commit efad126

Browse files
authored
Merge pull request #22 from package-url/migrate-vers
Migrate vers to its own repo
2 parents dde2e9d + 5001a00 commit efad126

File tree

132 files changed

+40
-12415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+40
-12415
lines changed

.github/workflows/generate-index-and-docs.yml renamed to .github/workflows/validate-docs.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check and generate PURL Type Docs and Index
33
on:
44
push:
55
paths:
6-
- "types/*.json"
6+
- "schemes/*.json"
77
- "schemas/*.json"
88
- "etc/"
99
branches:
@@ -13,7 +13,7 @@ on:
1313
permissions: { }
1414

1515
jobs:
16-
generate-index-and-docs:
16+
validate-docs:
1717
runs-on: ubuntu-latest
1818
permissions:
1919
content: write
@@ -33,13 +33,3 @@ jobs:
3333
- name: Validate code and data formats
3434
run: make check
3535

36-
- name: Generate index and docs
37-
run: make gendocs
38-
39-
- name: Commit and push changes
40-
run: |
41-
git config --global user.name "github-actions[bot]"
42-
git config --global user.email "github-actions[bot]@users.noreply.github.com"
43-
git add types/ types-doc/
44-
git commit -s -m "Generate updated PURL type documentation" || echo "No changes to commit"
45-
git push

ADOPTERS.rst

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,19 @@ Adopters
33

44
(alphabetical order)
55

6+
- `Common Security Advisory Framework (CSAF)
7+
<https://docs.oasis-open.org/csaf/csaf/v2.0/os/csaf-v2.0-os.html#31232-branches-type---name-under-product-version-range>`_:
8+
A language to exchange Security Advisories.
69
- `CycloneDX <https://github.com/CycloneDX>`_: A lightweight software
710
bill-of-material (SBOM) specification
8-
- `GitHub Dependency Submission API <https://docs.github.com/en/rest/dependency-graph/dependency-submission>`_: allows third-party tools
9-
to submit dependency data to GitHub for inclusion in a repository's dependency graph.
10-
- `OWASP Dependency-Track <https://www.owasp.org/index.php/OWASP_Dependency_Track_Project>`_:
11-
Open source component analysis platform
12-
- `OSS Index <https://ossindex.sonatype.org>`_: A free catalog of Open Source
13-
Components and scanning tools to help developers identify vulnerable components
14-
- `OSS Review Toolkit <https://oss-review-toolkit.org/>`_: A suite of tools to
15-
assist with automating Open Source compliance checks.
16-
- `OSV Schema <https://ossf.github.io/osv-schema/>`_ and `OSV.dev <https://osv.dev>`_:
17-
Open Source Vulnerability Schema and distributed vulnerability database
18-
- `ReversingLabs Spectra Assure <https://www.reversinglabs.com/products/software-supply-chain-security>`_:
19-
Software supply chain security platform for the enterprise to detect threats and exposures
20-
- `Scancode Toolkit <https://github.com/nexB/scancode-toolkit>`_: Reports
21-
`purl` from parsed package manifests using https://github.com/package-url/packageurl-python
22-
- `Sonatype Nexus Lifecycle <https://www.sonatype.com/product-nexus-lifecycle>`_:
23-
Enterprise grade Open Source component management
24-
- `SPDX <https://spdx.dev>`_: A data exchange standard for human-readable and
25-
machine-processable software bill-of-materials (SBOM)
11+
- `Scancode.io <https://github.com/aboutcode-org/scancode.io>`_: Collects
12+
``VERS`` from scanned and matched packages using https://github.com/aboutcode-org/univers
13+
- `Scancode Toolkit <https://github.com/aboutcode-org/scancode-toolkit>`_: Collects
14+
``VERS`` from parsed package manifests using https://github.com/aboutcode-org/univers
15+
- `univers <https://github.com/aboutcode-org/univers>`_: A Python implementation of VERS
16+
- `URI-PackageURL <https://github.com/giterlizzi/perl-URI-PackageURL/tree/master/lib/URI/VersionRange>`_:
17+
A Perl implementation of PURL and VERS
18+
- `versatile <https://github.com/nscuro/versatile>`_: A Java implementation of VERS
19+
- `vers <https://github.com/andrew/vers/>`_: A Ruby implementation of VERS
20+
2621

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
# Copyright (c) the purl authors
3-
# Visit https://github.com/package-url/purl-spec and https://packageurl.org for support
3+
# Visit https://github.com/package-url/vers-spec and https://packageurl.org for support
44

55
PYTHON_EXE?=python3
66
VENV_LOCATION=venv
@@ -39,7 +39,7 @@ formatcode:
3939
formatjson:
4040
@echo "-> Format JSON files"
4141
@${ACTIVATE} python etc/scripts/format_json.py schemas/
42-
@${ACTIVATE} python etc/scripts/format_json.py types/
42+
@${ACTIVATE} python etc/scripts/format_json.py schemes/
4343
@${ACTIVATE} python etc/scripts/format_json.py tests/
4444

4545
format: formatcode formatjson
@@ -49,9 +49,9 @@ checkjson:
4949
@echo "-> Validate JSON schemas"
5050
@${ACTIVATE} check-jsonschema --check-metaschema --verbose schemas/*.json
5151
@echo "-> Validate JSON data files against the schemas"
52-
@${ACTIVATE} check-jsonschema --schemafile schemas/purl-types-index.schema.json --verbose purl-types-index.json
53-
@${ACTIVATE} check-jsonschema --schemafile schemas/purl-type-definition.schema.json --verbose types/*-definition.json
54-
@${ACTIVATE} check-jsonschema --schemafile schemas/purl-test.schema.json --verbose tests/*/*-test.json
52+
@${ACTIVATE} check-jsonschema --schemafile schemas/vers-schemes-index.schema.json --verbose vers-schemes-index.json
53+
@${ACTIVATE} check-jsonschema --schemafile schemas/vers-scheme-definition.schema.json --verbose schemes/*-definition.json
54+
@${ACTIVATE} check-jsonschema --schemafile schemas/vers-test.schema.json --verbose tests/*/*-test.json
5555

5656
checkcode:
5757
@echo "-> Run Ruff linter validation (pycodestyle, bandit, isort, and more)"
@@ -70,14 +70,14 @@ clean:
7070
gencode:
7171
@echo "-> Generate Python code from schemas"
7272
@${ACTIVATE} ${CODEGEN} \
73-
--input schemas/purl-types-index.schema.json \
74-
--output etc/scripts/purl_types_index.py
73+
--input schemas/vers-schemes-index.schema.json \
74+
--output etc/scripts/vers_schemes_index.py
7575
@${ACTIVATE} ${CODEGEN} \
76-
--input schemas/purl-type-definition.schema.json \
77-
--output etc/scripts/purl_type_definition.py
76+
--input schemas/vers-scheme-definition.schema.json \
77+
--output etc/scripts/vers_scheme_definition.py
7878
@${ACTIVATE} ${CODEGEN} \
79-
--input schemas/purl-test.schema.json \
80-
--output etc/scripts/purl_test.py
79+
--input schemas/vers-test.schema.json \
80+
--output etc/scripts/vers_test.py
8181
@echo "-> Run Black format for generated code"
8282
@${ACTIVATE} black -l 100 --preview --enable-unstable-feature string_processing etc/scripts/*.py
8383

0 commit comments

Comments
 (0)