chore: add support for version 3.13

intel · Jan 3, 2025 · ee8d7dd · ee8d7dd
1 parent fe7753d
commit ee8d7dd
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 3 deletions.
diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
     strategy:
       matrix:
-        python: ['3.9', '3.10', '3.11', '3.12']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -15,7 +15,7 @@ on:
         description: 'Force run tests which rely on external connectivity'
         required: false
         type: boolean
-
+pull
 env:
   ACTIONS: 1
   LONG_TESTS: 0
@@ -72,7 +72,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
     strategy:
       matrix:
-        python: ['3.9', '3.11', '3.12']
+        python: ['3.9', '3.11', '3.12', '3.13']
     timeout-minutes: 90
     steps:
       - name: Harden Runner
@@ -184,6 +184,107 @@ jobs:
           test/test_cli.py
           test/test_cvedb.py
 
+  long_tests:
+    name: Long tests on Python 3.13
+    permissions:
+      contents: read
+    if: |
+      ! github.event.pull_request.user.login == 'github-actions[bot]' ||
+      ! (
+        startsWith(github.head_ref, 'chore-sbom-py') ||
+        contains(
+          fromJSON('["chore-update-table","chore-precommit-config","chore-spdx-header"]'),
+          github.head_ref
+        )
+      )
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 120
+    env:
+      LONG_TESTS: 1
+
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        with:
+          python-version: '3.13'
+          cache: 'pip'
+
+      - name: "Skip tests if this is an automated sbom job"
+        env:
+          COMMIT_VAR: ${{ startsWith(github.head_ref, 'chore-sbom-py') && github.event.pull_request.user.login == 'github-actions[bot]' }}
+        run: |
+          if ${COMMIT_VAR} == true; then
+            echo "sbom=true" >> $GITHUB_ENV
+            echo "sbom set to true"
+          else
+            echo "sbom=false" >> $GITHUB_ENV
+            echo "sbom set to false"
+          fi
+
+      - name: Get date
+        id: get-date
+        run: |
+          echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
+          echo "yesterday=$(/bin/date -d "-1 day" -u "+%Y%m%d")" >> $GITHUB_OUTPUT
+      - name: Print Cache Keys
+        run: |
+          echo "Today's Cache Key: Linux-cve-bin-tool-${{ steps.get-date.outputs.date }}"
+          echo "Yesterday's Cache Key: Linux-cve-bin-tool-${{ steps.get-date.outputs.yesterday }}"
+      - name: Get today's cached database
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        id: todays-cache
+        with:
+          path: cache
+          key: Linux-cve-bin-tool-${{ steps.get-date.outputs.date }}
+      - name: Get yesterday's cached database if today's is not available
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        if: steps.todays-cache.outputs.cache-hit != 'true'
+        with:
+          path: cache
+          key: Linux-cve-bin-tool-${{ steps.get-date.outputs.yesterday }}
+
+      - name: Install cabextract
+        if: env.sbom != 'true'
+        run: sudo apt-get update && sudo apt-get install cabextract
+      - name: Install OS dependencies for testing PDF
+        if: env.sbom != 'true'
+        run: sudo apt-get install build-essential libpoppler-cpp-dev pkg-config python3-dev
+      - name: Install pdftotext, reportlab and cve-bin-tool
+        if: env.sbom != 'true'
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade setuptools
+          python -m pip install --upgrade wheel
+          python -m pip install --upgrade pdftotext
+          python -m pip install --upgrade reportlab
+          python -m pip install --upgrade -r dev-requirements.txt
+          python -m pip install --editable .
+      - name: Try single CLI run of tool
+        if: env.sbom != 'true'
+        run: |
+          [[ -e cache ]] && mkdir -p .cache && mv cache ~/.cache/cve-bin-tool
+          NO_EXIT_CVE_NUM=1 python -m cve_bin_tool.cli test/assets/test-kerberos-5-1.15.1.out
+          cp -r ~/.cache/cve-bin-tool cache
+      - name: Run async tests
+        if: env.sbom != 'true'
+        run: >
+          pytest --cov --cov-append -n 8 --cov-report=xml -v --durations=50
+          --ignore=test/test_cli.py
+          --ignore=test/test_cvedb.py
+          --ignore=test/test_requirements.py
+          --ignore=test/test_html.py
+          --ignore=test/test_json.py
+          --ignore=test/test_scanner.py
+          --ignore=test/test_language_parser.py
+      - name: Upload code coverage to codecov
+        if: env.sbom != 'true'
+        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+        with:
+          files: ./coverage.xml
+          flags: longtests
+          name: codecov-umbrella
+          fail_ci_if_error: false
+
   long_tests:
     name: Long tests on Python 3.10
     permissions:

diff --git a/setup.py b/setup.py
@@ -46,6 +46,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],