From 6e4e0b925d033cf659718daa3114623d41c44604 Mon Sep 17 00:00:00 2001 From: gpotter2 <10530980+gpotter2@users.noreply.github.com> Date: Wed, 20 May 2026 22:53:28 +0200 Subject: [PATCH 1/2] pr: bump CI versions AI-Assisted: no --- .config/ci/test.ps1 | 2 +- doc/scapy/installation.rst | 2 +- pyproject.toml | 1 + tox.ini | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.config/ci/test.ps1 b/.config/ci/test.ps1 index 0e6fc39c87c..5c6071bd4b2 100644 --- a/.config/ci/test.ps1 +++ b/.config/ci/test.ps1 @@ -6,7 +6,7 @@ # Usage: # ./test.ps1 # Examples: -# ./test.sh 3.13 +# ./test.sh 3.14 if ($args.Count -eq 0) { Write-Host "Usage: .\test.ps1 " diff --git a/doc/scapy/installation.rst b/doc/scapy/installation.rst index 695b0403a77..17995cfb6b5 100644 --- a/doc/scapy/installation.rst +++ b/doc/scapy/installation.rst @@ -29,7 +29,7 @@ Scapy versions +------------------+-------+-------+--------+ | Python 3.4-3.6 | ❌ | ✅ | ❌ | +------------------+-------+-------+--------+ -| Python 3.7-3.11 | ❌ | ✅ | ✅ | +| Python 3.7-3.14 | ❌ | ✅ | ✅ | +------------------+-------+-------+--------+ Installing Scapy v2.x diff --git a/pyproject.toml b/pyproject.toml index 1d5ffabfc4f..805ba278b18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,6 +36,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Topic :: Security", "Topic :: System :: Networking", "Topic :: System :: Networking :: Monitoring", diff --git a/tox.ini b/tox.ini index 442ba9fdab1..ed60c7524c1 100644 --- a/tox.ini +++ b/tox.ini @@ -4,13 +4,13 @@ # Tox environments: # py{version}-{os}-{non_root,root} -# In our testing, version can be 37 to 313 or py39 for pypy39 +# In our testing, version can be 37 to 314 or py39 for pypy39 [tox] # minversion = 4.0 skip_missing_interpreters = true # envlist = default when doing 'tox' -envlist = py{37,38,39,310,311,312,313}-{linux,bsd,windows}-{non_root,root} +envlist = py{37,38,39,310,311,312,313,314}-{linux,bsd,windows}-{non_root,root} # Main tests From 14b9010077ce1105edbf32726a435b5984f54f9b Mon Sep 17 00:00:00 2001 From: gpotter2 <10530980+gpotter2@users.noreply.github.com> Date: Wed, 20 May 2026 23:52:52 +0200 Subject: [PATCH 2/2] gh: skip the steps, not the job for push jobs AI-Assisted: no --- .github/workflows/unittests.yml | 4 +++- tox.ini | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index e28b7773751..66cea5a995a 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -19,18 +19,20 @@ jobs: commit: name: Check the validity of the commits runs-on: ubuntu-latest - if: github.event_name == 'pull_request' # We follow the same contributing patterns as Wireshark. Thanks to # https://gitlab.com/wireshark/wireshark/-/blob/master/.gitlab-ci.yml steps: - name: Get the number of commits in the PR run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" + if: github.event_name == 'pull_request' - name: Checkout Scapy uses: actions/checkout@v6 with: fetch-depth: ${{ env.PR_FETCH_DEPTH }} + if: github.event_name == 'pull_request' - name: AI trailer reminder run: bash ./.config/ci/check_commits.sh + if: github.event_name == 'pull_request' spdx: name: Check SPDX identifiers (Licensing) runs-on: ubuntu-latest diff --git a/tox.ini b/tox.ini index ed60c7524c1..42fe881b8ca 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # Tox environments: # py{version}-{os}-{non_root,root} -# In our testing, version can be 37 to 314 or py39 for pypy39 +# In our testing, version can be 37 to 314 or py311 for pypy311 [tox] # minversion = 4.0