From c268f4ddd8c5f47d468902e839f6eb08bc733741 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 20 Oct 2023 14:01:13 +0100 Subject: [PATCH] Test on Python 3.13 --- .github/workflows/python_ci.yml | 9 +++++---- .github/workflows/python_ci_linux.yml | 9 +++++---- .github/workflows/python_ci_macos.yml | 9 +++++---- pyproject.toml | 2 +- repo_helper.yml | 3 ++- tox.ini | 22 ++++++++++++++++++---- 6 files changed, 36 insertions(+), 18 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index d28a5db..5366694 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,10 +34,11 @@ jobs: - {python-version: "3.9", testenvs: "py39-click{7,8.0,8.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7,8.0,8.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8.0,8.1},build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-click{7,8.0,8.1},build", experimental: True} + - {python-version: "3.12", testenvs: "py312-click{7,8.0,8.1},build", experimental: False} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-click{7,8.0}", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-click{7,8.0,8.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-click{7,8.0,8.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-click{7,8.0,8.1},build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-click{7,8.0,8.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-click{7,8.0,8.1},build", experimental: True} steps: diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index d716111..d1a35bd 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,10 +35,11 @@ jobs: - {python-version: "3.9", testenvs: "py39-click{7,8.0,8.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7,8.0,8.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8.0,8.1},build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-click{7,8.0,8.1},build", experimental: True} + - {python-version: "3.12", testenvs: "py312-click{7,8.0,8.1},build", experimental: False} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-click{7,8.0},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-click{7,8.0,8.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-click{7,8.0,8.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-click{7,8.0,8.1},build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-click{7,8.0,8.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-click{7,8.0,8.1},build", experimental: True} steps: diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 5cee3b3..2141b62 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,9 +34,10 @@ jobs: - {python-version: "3.9", testenvs: "py39-click{7,8.0,8.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7,8.0,8.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-click{7,8.0,8.1},build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-click{7,8.0,8.1},build", experimental: True} - - {python-version: "pypy-3.7", testenvs: "pypy37-click{7,8.0,8.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-click{7,8.0,8.1},build", experimental: True} + - {python-version: "3.12", testenvs: "py312-click{7,8.0,8.1},build", experimental: False} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-click{7,8.0,8.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-click{7,8.0,8.1},build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-click{7,8.0,8.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-click{7,8.0,8.1},build", experimental: True} steps: diff --git a/pyproject.toml b/pyproject.toml index 5788c0a..2102719 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ base-classifiers = [ "Intended Audience :: Developers", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11",] +python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",] python-implementations = [ "CPython", "PyPy",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 8ca7d4b..6707630 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -31,7 +31,8 @@ python_versions: '3.9': '3.10': '3.11': - 3.12-dev: + '3.12': + 3.13-dev: pypy36: matrix_exclude: click: diff --git a/tox.ini b/tox.ini index 92c7f27..84a590f 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,9 @@ # * envlists # * testenv # * testenv:.package +# * testenv:py313-dev # * testenv:py312-dev +# * testenv:py312 # * testenv:docs # * testenv:build # * testenv:lint @@ -26,7 +28,8 @@ envlist = py39-click{7,8.0,8.1} py310-click{7,8.0,8.1} py311-click{7,8.0,8.1} - py312-dev-click{7,8.0,8.1} + py312-click{7,8.0,8.1} + py313-dev-click{7,8.0,8.1} pypy36-click{7,8.0} pypy37-click{7,8.0,8.1} pypy38-click{7,8.0,8.1} @@ -49,7 +52,8 @@ test = py39-click{7,8.0,8.1} py310-click{7,8.0,8.1} py311-click{7,8.0,8.1} - py312-dev-click{7,8.0,8.1} + py312-click{7,8.0,8.1} + py313-dev-click{7,8.0,8.1} pypy36-click{7,8.0} pypy37-click{7,8.0,8.1} pypy38-click{7,8.0,8.1} @@ -76,7 +80,12 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py312-dev] +[testenv:py313-dev] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + +[testenv:py312] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -237,7 +246,12 @@ filterwarnings = ignore:lib2to3 package is deprecated and may not be able to parse Python 3.10+:PendingDeprecationWarning always:ast.Str is deprecated and will be removed in Python 3.14; use ast.Constant instead:DeprecationWarning -[testenv:py312-dev-click{7,8.0,8.1}] +[testenv:py312-click{7,8.0,8.1}] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + +[testenv:py313-dev-click{7,8.0,8.1}] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1