From 731297a057a8e2c53b75d52f69aa4650e9f71529 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 11 Feb 2025 15:01:29 -0500 Subject: [PATCH 1/3] chore: drop support for Python 3.8 Update 'ubuntu-20.04' image to 'ubuntu-24.04' for Github CI. --- .github/workflows/ci-tests.yml | 25 ++++++++++++------------- CHANGES.rst | 2 +- tox.ini | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 37f0d86cd..025f79bc4 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -15,14 +15,13 @@ jobs: strategy: matrix: py: - - "3.8" - "3.9" - "3.10" - "3.11" - "3.12" - - "pypy-3.8" + - "pypy-3.10" os: - - "ubuntu-20.04" + - "ubuntu-24.04" - "windows-2022" - "macos-11" architecture: @@ -30,16 +29,16 @@ jobs: - x86 include: - # Only run coverage on ubuntu-20.04, except on pypy3 - - os: "ubuntu-20.04" + # Only run coverage on ubuntu-24.04, except on pypy3 + - os: "ubuntu-24.04" pytest-args: "--cov" - - os: "ubuntu-20.04" - py: "pypy-3.8" + - os: "ubuntu-24.04" + py: "pypy-3.10" pytest-args: "" exclude: # Linux and macOS don't have x86 python - - os: "ubuntu-20.04" + - os: "ubuntu-24.04" architecture: x86 - os: "macos-11" architecture: x86 @@ -57,7 +56,7 @@ jobs: - name: Running tox run: tox -e py -- ${{ matrix.pytest-args }} coverage: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Validate coverage steps: - uses: actions/checkout@v4 @@ -69,26 +68,26 @@ jobs: - run: pip install tox - run: tox -e py312-cover,coverage docs: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Build the documentation steps: - uses: actions/checkout@v4 - name: Setup python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 architecture: x64 - run: pip install tox - run: tox -e docs lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Lint the package steps: - uses: actions/checkout@v4 - name: Setup python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 architecture: x64 - run: pip install tox - run: tox -e lint diff --git a/CHANGES.rst b/CHANGES.rst index 30005c96f..a39c71b53 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -55,7 +55,7 @@ Bug Fixes Backward Incompatibilities -------------------------- -- Drop support for Python 3.6 and 3.7. +- Drop support for Python 3.6 3.7, and 3.8. - Drop support for l*gettext() methods in the i18n module. These have been deprecated in Python's gettext module since 3.8, and diff --git a/tox.ini b/tox.ini index ff962a935..84205baa7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = lint, - py38,py39,py310,py311,py312,pypy3, + py39,py310,py311,py312,pypy3, py312-cover,coverage, docs From 753f41513af7caa724eef35496a926ea63989c31 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Sun, 23 Feb 2025 11:35:12 -0500 Subject: [PATCH 2/3] chore: garden changelog --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index a39c71b53..d0acd6beb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,7 +9,7 @@ Features - Added HTTP 418 error code via `pyramid.httpexceptions.HTTPImATeapot`. See https://github.com/Pylons/pyramid/pull/3667 -- Coverage reports in tests based on Python 3.12 instead of Python 3.8. +- Base coverage reports in tests on Python 3.12 instead of Python 3.8. - All scripts now pass a new option ``__script__`` when loading the WSGI app. For example, ``pserve`` sets ``__script__ == 'pserve'``. This works for @@ -55,7 +55,7 @@ Bug Fixes Backward Incompatibilities -------------------------- -- Drop support for Python 3.6 3.7, and 3.8. +- Drop support for Python 3.6, 3.7, and 3.8. - Drop support for l*gettext() methods in the i18n module. These have been deprecated in Python's gettext module since 3.8, and From 96a69c82ef32313267786f8fd7005186df56899c Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Sun, 23 Feb 2025 11:39:14 -0500 Subject: [PATCH 3/3] ci: bump MacOS image to 'macos-13' GHA no longer supports older images for public repos. --- .github/workflows/ci-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 025f79bc4..9d22db029 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -23,7 +23,7 @@ jobs: os: - "ubuntu-24.04" - "windows-2022" - - "macos-11" + - "macos-13" architecture: - x64 - x86 @@ -40,7 +40,7 @@ jobs: # Linux and macOS don't have x86 python - os: "ubuntu-24.04" architecture: x86 - - os: "macos-11" + - os: "macos-13" architecture: x86 name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"