Move Python 3.10 testing to 3.11

To match the pattern of testing the latest and oldest supported versions.
Gabisampaio · Feb 9, 2024 · 1019239 · 1019239
1 parent f988cee
commit 1019239
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 46 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -39,7 +39,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/affected_tests.yml
     parameters:
       artifactName: 'safari-preview-affected-tests'
@@ -56,7 +56,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/affected_tests.yml
     parameters:
       checkoutCommit: 'HEAD^1'
@@ -77,7 +77,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - script: |
       set -eux -o pipefail
@@ -98,7 +98,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
     parameters:
@@ -153,15 +153,15 @@ jobs:
       toxenv: py37
 
 - job: tools_unittest_mac_py310
-  displayName: 'tools/ unittests: macOS + Python 3.10'
+  displayName: 'tools/ unittests: macOS + Python 3.11'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'macOS-13'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
@@ -186,15 +186,15 @@ jobs:
       toxenv: py37
 
 - job: wptrunner_unittest_mac_py310
-  displayName: 'tools/wptrunner/ unittests: macOS + Python 3.10'
+  displayName: 'tools/wptrunner/ unittests: macOS + Python 3.11'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'macOS-13'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
@@ -223,7 +223,7 @@ jobs:
       toxenv: py37
 
 - job: wpt_integration_mac_py310
-  displayName: 'tools/wpt/ tests: macOS + Python 3.10'
+  displayName: 'tools/wpt/ tests: macOS + Python 3.11'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
@@ -232,7 +232,7 @@ jobs:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/install_chrome.yml
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
@@ -262,15 +262,15 @@ jobs:
       toxenv: py37
 
 - job: tools_unittest_win_py310
-  displayName: 'tools/ unittests: Windows + Python 3.10'
+  displayName: 'tools/ unittests: Windows + Python 3.11'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'windows-2019'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
       addToPath: false
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
@@ -296,15 +296,15 @@ jobs:
       toxenv: py37
 
 - job: wptrunner_unittest_win_py310
-  displayName: 'tools/wptrunner/ unittests: Windows + Python 3.10'
+  displayName: 'tools/wptrunner/ unittests: Windows + Python 3.11'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
   pool:
     vmImage: 'windows-2019'
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
       addToPath: false
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
@@ -335,7 +335,7 @@ jobs:
       toxenv: py37
 
 - job: wpt_integration_win_py310
-  displayName: 'tools/wpt/ tests: Windows + Python 3.10'
+  displayName: 'tools/wpt/ tests: Windows + Python 3.11'
   dependsOn: decision
   condition: dependencies.decision.outputs['test_jobs.wpt_integration']
   pool:
@@ -344,7 +344,7 @@ jobs:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   # currently just using the outdated Chrome/Firefox on the VM rather than
   # figuring out how to install Chrome Dev channel on Windows
   # - template: tools/ci/azure/install_chrome.yml
@@ -370,7 +370,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
@@ -409,7 +409,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
@@ -448,7 +448,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
     parameters:
@@ -486,7 +486,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
     parameters:
@@ -529,7 +529,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.10'
+      versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
     parameters:

diff --git a/resources/test/tox.ini b/resources/test/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310
+envlist = py37,py38,py39,py310,py311
 skipsdist=True
 
 [testenv]

diff --git a/tools/ci/tc/tasks/test.yml b/tools/ci/tc/tasks/test.yml
@@ -118,16 +118,15 @@ components:
       - python3.7-dev
       - python3.7-venv
 
-  tox-python3_10:
+  tox-python3_11:
     env:
-      TOXENV: py310
+      TOXENV: py311
       PY_COLORS: "0"
     install:
-      - python3.10
-      - python3.10-distutils
-      - python3.10-dev
-      - python3.10-venv
-
+      - python3.11
+      - python3.11-distutils
+      - python3.11-dev
+      - python3.11-venv
   tests-affected:
     options:
       browser:
@@ -425,13 +424,13 @@ tasks:
         run-job:
           - tools_unittest
 
-  - tools/ unittests (Python 3.10):
+  - tools/ unittests (Python 3.11):
       description: >-
-        Unit tests for tools running under Python 3.10, excluding wptrunner
+        Unit tests for tools running under Python 3.11, excluding wptrunner
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_10
+        - tox-python3_11
       command: ./tools/ci/ci_tools_unittest.sh
       env:
         HYPOTHESIS_PROFILE: ci
@@ -461,13 +460,13 @@ tasks:
         run-job:
           - wpt_integration
 
-  - tools/ integration tests (Python 3.10):
+  - tools/ integration tests (Python 3.11):
       description: >-
-        Integration tests for tools running under Python 3.10
+        Integration tests for tools running under Python 3.11
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_10
+        - tox-python3_11
       command: ./tools/ci/ci_tools_integration_test.sh
       install:
         - libnss3-tools
@@ -502,13 +501,13 @@ tasks:
         run-job:
           - resources_unittest
 
-  - resources/ tests (Python 3.10):
+  - resources/ tests (Python 3.11):
       description: >-
-        Tests for testharness.js and other files in resources/ under Python 3.10
+        Tests for testharness.js and other files in resources/ under Python 3.11
       use:
         - wpt-base
         - trigger-pr
-        - tox-python3_10
+        - tox-python3_11
       command: ./tools/ci/ci_resources_unittest.sh
       install:
         - libnss3-tools

diff --git a/tools/ci/tc/tests/test_valid.py b/tools/ci/tc/tests/test_valid.py
@@ -154,11 +154,11 @@ def test_verify_payload():
     ("pr_event.json", True, {".taskcluster.yml", ".travis.yml", "tools/ci/start.sh"},
      ['lint',
       'tools/ unittests (Python 3.7)',
-      'tools/ unittests (Python 3.10)',
+      'tools/ unittests (Python 3.11)',
       'tools/ integration tests (Python 3.7)',
-      'tools/ integration tests (Python 3.10)',
+      'tools/ integration tests (Python 3.11)',
       'resources/ tests (Python 3.7)',
-      'resources/ tests (Python 3.10)',
+      'resources/ tests (Python 3.11)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'sink-task']),
@@ -176,7 +176,7 @@ def test_verify_payload():
     ("pr_event_tests_affected.json", True, {"resources/testharness.js"},
      ['lint',
       'resources/ tests (Python 3.7)',
-      'resources/ tests (Python 3.10)',
+      'resources/ tests (Python 3.11)',
       'download-firefox-nightly',
       'infrastructure/ tests',
       'sink-task']),

diff --git a/tools/tox.ini b/tools/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310,{py37,py38,py39,py310}-{flake8,mypy}
+envlist = py37,py38,py39,py310,py311,{py37,py38,py39,py310,py311}-{flake8,mypy}
 skipsdist=True
 skip_missing_interpreters=False
 

diff --git a/tools/wave/tox.ini b/tools/wave/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310
+envlist = py37,py38,py39,py310,py311
 skipsdist=True
 skip_missing_interpreters = False
 

diff --git a/tools/wpt/tox.ini b/tools/wpt/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310
+envlist = py37,py38,py39,py310,py311
 skipsdist=True
 skip_missing_interpreters = False
 

diff --git a/tools/wptrunner/tox.ini b/tools/wptrunner/tox.ini
@@ -2,7 +2,7 @@
 xfail_strict=true
 
 [tox]
-envlist = py310-{base,chrome,edge,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39}-base
+envlist = py311-{base,chrome,edge,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39,py310}-base
 skip_missing_interpreters = False
 
 [testenv]