diff --git a/.github/workflows/publish_v3.yml b/.github/workflows/publish_v3.yml index 6643549ad3..ee4b57bdd9 100644 --- a/.github/workflows/publish_v3.yml +++ b/.github/workflows/publish_v3.yml @@ -9,7 +9,6 @@ on: jobs: build: runs-on: ubuntu-latest - container: python:3 env: REF_SPEC: "development/v3.0.1" # spec branch/tag release REF_MODEL: "main" # model branch/tag release @@ -30,23 +29,28 @@ jobs: REDIRECT_TEMPLATE_PATH: "etc/redirect-template.html" # redirect HTML template steps: - name: Checkout spdx-spec - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 with: ref: ${{ env.REF_SPEC }} path: spdx-spec fetch-depth: 0 # Because we will be pushing the gh-pages branch - name: Checkout spdx-3-model - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 with: repository: spdx/spdx-3-model ref: ${{ env.REF_MODEL }} path: spdx-3-model - name: Checkout spec-parser - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 with: repository: spdx/spec-parser ref: ${{ env.REF_PARSER }} path: spec-parser + - name: Set up specific Python version + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0 + with: + python-version: "3.12" + cache: "pip" - name: Install pre-requisites for spdx-spec run: pip install -r spdx-spec/requirements.txt - name: Install pre-requisites for spec-parser diff --git a/.github/workflows/validate_examples.yml b/.github/workflows/validate_examples.yml index 56e611ff77..33dbbe73b5 100644 --- a/.github/workflows/validate_examples.yml +++ b/.github/workflows/validate_examples.yml @@ -12,10 +12,16 @@ jobs: validate-examples: runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 + - name: Checkout spdx-spec + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 + - name: Set up specific Python version + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0 + with: + python-version: "3.12" + cache: "pip" - name: Install Python dependencies run: | - python3 -m pip install pyshacl==0.26.0 check-jsonschema==0.29.2 + python3 -m pip install check-jsonschema==0.29.4 pyshacl==0.27.0 - name: Install dependencies run: | sudo apt install -y gawk diff --git a/.github/workflows/validate_pull_request.yml b/.github/workflows/validate_pull_request.yml index 264be233bf..c21158a16c 100644 --- a/.github/workflows/validate_pull_request.yml +++ b/.github/workflows/validate_pull_request.yml @@ -4,12 +4,16 @@ jobs: validate: name: Validate build runs-on: ubuntu-latest - container: python:3 steps: - name: Checkout spdx-spec - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 with: fetch-depth: 1 + - name: Set up specific Python version + uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0 + with: + python-version: "3.12" + cache: "pip" - name: Install pre-requisites run: pip install -r requirements.txt - name: Build the site to validate (use mkdocs.yml, no model files, no PDF export) diff --git a/bin/pull-license-list.py b/bin/pull-license-list.py index 6be0628ad0..1e1a361880 100755 --- a/bin/pull-license-list.py +++ b/bin/pull-license-list.py @@ -5,7 +5,7 @@ # # usage: ./bin/pull-license.py # -# Script licensed under SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT import codecs import itertools diff --git a/docs/conformance.md b/docs/conformance.md index c546141883..23994959d0 100644 --- a/docs/conformance.md +++ b/docs/conformance.md @@ -61,7 +61,7 @@ bills of materials information produced by tools supporting SPDX. ## Software Profile compliance point The Software Profile includes the definitions of classes, properties and -vocabularies for refering to and conveying information about software and is +vocabularies for referring to and conveying information about software and is usable by all SPDX profiles when producing or consuming SPDX content. Software that conforms to the SPDX specification at the Software Profile