From a7530e4c989e15ffe216f3529fb029ddd8fa7ab5 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 1 Nov 2023 11:39:18 +0100 Subject: [PATCH 1/2] Update supported Python versions for tests to 3.12 and back to 3.8 for security releases --- .github/workflows/test.yml | 51 ++++++++++++++++++++++++++++---------- .gitignore | 9 ++++--- requirements/tests.txt | 2 +- tests/conftest.py | 2 +- tox.ini | 2 +- 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ea00d6e..60d8a0af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,6 @@ on: push: branches: - master - tags: pull_request: jobs: @@ -16,29 +15,55 @@ jobs: include: # linux - os: ubuntu-latest - python: 3.7 - toxenv: py37 + python: "3.12" + toxenv: py312 - os: ubuntu-latest - python: 3.8 - toxenv: py38 + python: "3.11" + toxenv: py311 + - os: ubuntu-latest + python: "3.10" + toxenv: py310 - os: ubuntu-latest - python: 3.9 + python: "3.9" toxenv: py39 - # Blocked by https://github.com/web-platform-tests/wpt/issues/35978 - # - os: ubuntu-latest - # python: "3.10" - # toxenv: py310 + - os: ubuntu-latest + python: "3.8" + toxenv: py38 # windows - os: windows-latest - python: 3.8 + python: "3.12" + toxenv: py312 + - os: windows-latest + python: "3.11" + toxenv: py311 + - os: windows-latest + python: "3.10" + toxenv: py310 + - os: windows-latest + python: "3.9" + toxenv: py39 + - os: windows-latest + python: "3.8" toxenv: py38 # macos - os: macos-latest - python: 3.8 + python: "3.12" + toxenv: py312 + - os: macos-latest + python: "3.11" + toxenv: py311 + - os: macos-latest + python: "3.10" + toxenv: py310 + - os: macos-latest + python: "3.9" + toxenv: py39 + - os: macos-latest + python: "3.8" toxenv: py38 # misc - os: ubuntu-latest - python: 3.8 + python: "3.11" toxenv: pylama steps: diff --git a/.gitignore b/.gitignore index f4c984de..1af5d953 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ .idea/ .cache/ +.pytest_cache/ .tox/ +.vscode/ +build/ +dist/ *.egg-info *.pyc .coverage -.pytest_cache/ -.vscode/ -build -dist +.DS_Store diff --git a/requirements/tests.txt b/requirements/tests.txt index b9d55ec1..8e2a9c4f 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -2,4 +2,4 @@ coveralls[yaml]==3.3.1 pytest==7.4.4 pytest-cov==4.1.0 pytest-mock==3.11.1 -wptserve==3.0 +wptserve==4.0.2 diff --git a/tests/conftest.py b/tests/conftest.py index c50a6952..32150027 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -47,7 +47,7 @@ def httpd(): doc_root=os.path.join(HERE, 'data'), routes=routes, ) - httpd.start(block=False) + httpd.start() yield httpd httpd.stop() diff --git a/tox.ini b/tox.ini index 9c20ee47..22838f43 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37, py38, py39, pylama +envlist = py38, py39, py310, py311, py312, pylama [testenv] usedevelop = true From 75fb8e5810654f6caca80e6195fb0055b5110fee Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 17 Apr 2024 22:05:37 +0200 Subject: [PATCH 2/2] Update list of supported Python versions in setup.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 79b56947..94e29eaf 100755 --- a/setup.py +++ b/setup.py @@ -40,9 +40,11 @@ def get_version(): "Topic :: System :: Software Distribution", "Topic :: Utilities", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], keywords='mozilla', author='Mozilla Automation and Testing Team',