Bug 1821391 [wpt PR 38911] - Drop Python 3.6 support from tools/, a=testonly

Automatic update from web-platform-tests
Drop Python 3.6 support from tools/

This replaces the 3.6-based CI jobs with Python 3.7, and drops 3.6
from test configurations.

It also updates requirements files that have specific pinned package
versions for 3.6, but does not attempt to update dependencies in
general (either through requirements or pinned).

--

wpt-commits: 8cf108d380ee91ef2667a05dd2389ad5cd6d6529
wpt-pr: 38911
This commit is contained in:
James Graham 2023-03-20 20:18:57 +00:00 коммит произвёл moz-wptsync-bot
Родитель 050d07e361
Коммит b16df8f886
10 изменённых файлов: 35 добавлений и 41 удалений

Просмотреть файл

@ -233,7 +233,7 @@ jobs:
toxenv: py310
- job: tools_unittest_win_py37
displayName: 'tools/ unittests: Windows + Python 3.6'
displayName: 'tools/ unittests: Windows + Python 3.7'
dependsOn: decision
condition: dependencies.decision.outputs['test_jobs.tools_unittest']
pool:
@ -243,7 +243,7 @@ jobs:
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.7'
addToPath: false
- template: tools/ci/azure/checkout.yml
- template: tools/ci/azure/tox_pytest.yml
@ -268,8 +268,8 @@ jobs:
directory: tools/
toxenv: py310
- job: wptrunner_unittest_win_py36
displayName: 'tools/wptrunner/ unittests: Windows + Python 3.6'
- job: wptrunner_unittest_win_py37
displayName: 'tools/wptrunner/ unittests: Windows + Python 3.7'
dependsOn: decision
condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
pool:
@ -277,13 +277,13 @@ jobs:
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.7'
addToPath: false
- template: tools/ci/azure/checkout.yml
- template: tools/ci/azure/tox_pytest.yml
parameters:
directory: tools/wptrunner/
toxenv: py36
toxenv: py37
- job: wptrunner_unittest_win_py310
displayName: 'tools/wptrunner/ unittests: Windows + Python 3.10'
@ -302,8 +302,8 @@ jobs:
directory: tools/wptrunner/
toxenv: py310
- job: wpt_integration_win_py36
displayName: 'tools/wpt/ tests: Windows + Python 3.6'
- job: wpt_integration_win_py37
displayName: 'tools/wpt/ tests: Windows + Python 3.7'
dependsOn: decision
condition: dependencies.decision.outputs['test_jobs.wpt_integration']
pool:
@ -312,7 +312,7 @@ jobs:
# full checkout required
- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.7'
# 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
@ -322,7 +322,7 @@ jobs:
- template: tools/ci/azure/tox_pytest.yml
parameters:
directory: tools/wpt/
toxenv: py36
toxenv: py37
- job: wpt_integration_win_py310
displayName: 'tools/wpt/ tests: Windows + Python 3.10'

Просмотреть файл

@ -108,14 +108,14 @@ components:
browser-servo: {}
tox-python3_6:
tox-python3_7:
env:
TOXENV: py36
TOXENV: py37
PY_COLORS: "0"
install:
- python3.6
- python3.6-distutils
- python3.6-dev
- python3.7
- python3.7-distutils
- python3.7-dev
tox-python3_10:
env:
@ -409,13 +409,13 @@ tasks:
- update_built
command: "./tools/ci/ci_built_diff.sh"
- tools/ unittests (Python 3.6):
- tools/ unittests (Python 3.7):
description: >-
Unit tests for tools running under Python 3.6, excluding wptrunner
Unit tests for tools running under Python 3.7, excluding wptrunner
use:
- wpt-base
- trigger-pr
- tox-python3_6
- tox-python3_7
command: ./tools/ci/ci_tools_unittest.sh
env:
HYPOTHESIS_PROFILE: ci
@ -437,13 +437,13 @@ tasks:
run-job:
- tools_unittest
- tools/ integration tests (Python 3.6):
- tools/ integration tests (Python 3.7):
description: >-
Integration tests for tools running under Python 3.6
Integration tests for tools running under Python 3.7
use:
- wpt-base
- trigger-pr
- tox-python3_6
- tox-python3_7
command: ./tools/ci/ci_tools_integration_test.sh
install:
- libnss3-tools
@ -481,13 +481,13 @@ tasks:
run-job:
- wpt_integration
- resources/ tests (Python 3.6):
- resources/ tests (Python 3.7):
description: >-
Tests for testharness.js and other files in resources/ under Python 3.6
Tests for testharness.js and other files in resources/ under Python 3.7
use:
- wpt-base
- trigger-pr
- tox-python3_6
- tox-python3_7
command: ./tools/ci/ci_resources_unittest.sh
install:
- libnss3-tools

Просмотреть файл

@ -153,11 +153,11 @@ def test_verify_payload():
'lint']),
("pr_event.json", True, {".taskcluster.yml", ".travis.yml", "tools/ci/start.sh"},
['lint',
'tools/ unittests (Python 3.6)',
'tools/ unittests (Python 3.7)',
'tools/ unittests (Python 3.10)',
'tools/ integration tests (Python 3.6)',
'tools/ integration tests (Python 3.7)',
'tools/ integration tests (Python 3.10)',
'resources/ tests (Python 3.6)',
'resources/ tests (Python 3.7)',
'resources/ tests (Python 3.10)',
'download-firefox-nightly',
'infrastructure/ tests',
@ -175,7 +175,7 @@ def test_verify_payload():
'sink-task']),
("pr_event_tests_affected.json", True, {"resources/testharness.js"},
['lint',
'resources/ tests (Python 3.6)',
'resources/ tests (Python 3.7)',
'resources/ tests (Python 3.10)',
'download-firefox-nightly',
'infrastructure/ tests',

Просмотреть файл

@ -39,7 +39,7 @@ RUN apt-get -qqy update \
wget \
xvfb
# python3.6 is not available by default in new versions of Ubuntu.
# Ensure all Python versions are available
RUN apt-add-repository -y ppa:deadsnakes/ppa
# Ensure a `python` binary exists

Просмотреть файл

@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39,py310,{py36,py37,py38,py39,py310}-{flake8,mypy}
envlist = py37,py38,py39,py310,{py37,py38,py39,py310}-{flake8,mypy}
skipsdist=True
skip_missing_interpreters=False

Просмотреть файл

@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39,py310
envlist = py37,py38,py39,py310
skipsdist=True
skip_missing_interpreters = False

Просмотреть файл

@ -1,4 +1 @@
# aioquic 0.9.15 is the last to support Python 3.6, but doesn't have prebuilt
# wheels for Python 3.10, so use a different version depending on Python.
aioquic==0.9.15; python_version == '3.6'
aioquic==0.9.19; python_version != '3.6'
aioquic==0.9.19

Просмотреть файл

@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39,py310
envlist = py37,py38,py39,py310
skipsdist=True
skip_missing_interpreters = False

Просмотреть файл

@ -1,4 +1 @@
# aioquic 0.9.15 is the last to support Python 3.6, but doesn't have prebuilt
# wheels for Python 3.10, so use a different version depending on Python.
aioquic==0.9.15; python_version == '3.6'
aioquic==0.9.19; python_version != '3.6'
aioquic==0.9.19

Просмотреть файл

@ -2,7 +2,7 @@
xfail_strict=true
[tox]
envlist = py310-{base,chrome,edge,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py36,py37,py38,py39}-base
envlist = py310-{base,chrome,edge,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39}-base
skip_missing_interpreters = False
[testenv]