From 54ea75569944a0521b286647e82742c9ba3dd1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Wed, 20 Nov 2024 17:28:43 +0200 Subject: [PATCH] Add 3.13 to ci. --- .github/workflows/github-actions.yml | 187 ++++++++++++++++++ .../.github/workflows/github-actions.yml | 7 +- setup.py | 1 + tox.ini | 5 +- 4 files changed, 196 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 5d7d369..9a0e520 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -53,6 +53,7 @@ jobs: tox_env: 'py39-nocov' cibw_arch: 'x86_64' cibw_build: 'cp39-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (ubuntu/x86_64/musllinux)' python: '3.9' @@ -61,6 +62,7 @@ jobs: tox_env: 'py39-nocov' cibw_arch: 'x86_64' cibw_build: 'cp39-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (ubuntu/aarch64/manylinux)' python: '3.9' @@ -69,6 +71,7 @@ jobs: tox_env: 'py39-nocov' cibw_arch: 'aarch64' cibw_build: 'cp39-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (ubuntu/aarch64/musllinux)' python: '3.9' @@ -77,6 +80,7 @@ jobs: tox_env: 'py39-nocov' cibw_arch: 'aarch64' cibw_build: 'cp39-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (windows/AMD64)' python: '3.9' @@ -85,6 +89,7 @@ jobs: tox_env: 'py39-nocov' cibw_arch: 'AMD64' cibw_build: 'cp39-*' + cibw_ft: 'false' os: 'windows-latest' - name: 'py39-nocov (macos/arm64)' python: '3.9' @@ -93,6 +98,7 @@ jobs: tox_env: 'py39-nocov' cibw_arch: 'arm64' cibw_build: 'cp39-*' + cibw_ft: 'false' os: 'macos-latest' - name: 'py310-cover (ubuntu/x86_64)' python: '3.10' @@ -128,6 +134,7 @@ jobs: tox_env: 'py310-nocov' cibw_arch: 'x86_64' cibw_build: 'cp310-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (ubuntu/x86_64/musllinux)' python: '3.10' @@ -136,6 +143,7 @@ jobs: tox_env: 'py310-nocov' cibw_arch: 'x86_64' cibw_build: 'cp310-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (ubuntu/aarch64/manylinux)' python: '3.10' @@ -144,6 +152,7 @@ jobs: tox_env: 'py310-nocov' cibw_arch: 'aarch64' cibw_build: 'cp310-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (ubuntu/aarch64/musllinux)' python: '3.10' @@ -152,6 +161,7 @@ jobs: tox_env: 'py310-nocov' cibw_arch: 'aarch64' cibw_build: 'cp310-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (windows/AMD64)' python: '3.10' @@ -160,6 +170,7 @@ jobs: tox_env: 'py310-nocov' cibw_arch: 'AMD64' cibw_build: 'cp310-*' + cibw_ft: 'false' os: 'windows-latest' - name: 'py310-nocov (macos/arm64)' python: '3.10' @@ -168,6 +179,7 @@ jobs: tox_env: 'py310-nocov' cibw_arch: 'arm64' cibw_build: 'cp310-*' + cibw_ft: 'false' os: 'macos-latest' - name: 'py311-cover (ubuntu/x86_64)' python: '3.11' @@ -203,6 +215,7 @@ jobs: tox_env: 'py311-nocov' cibw_arch: 'x86_64' cibw_build: 'cp311-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py311-nocov (ubuntu/x86_64/musllinux)' python: '3.11' @@ -211,6 +224,7 @@ jobs: tox_env: 'py311-nocov' cibw_arch: 'x86_64' cibw_build: 'cp311-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py311-nocov (ubuntu/aarch64/manylinux)' python: '3.11' @@ -219,6 +233,7 @@ jobs: tox_env: 'py311-nocov' cibw_arch: 'aarch64' cibw_build: 'cp311-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py311-nocov (ubuntu/aarch64/musllinux)' python: '3.11' @@ -227,6 +242,7 @@ jobs: tox_env: 'py311-nocov' cibw_arch: 'aarch64' cibw_build: 'cp311-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py311-nocov (windows/AMD64)' python: '3.11' @@ -235,6 +251,7 @@ jobs: tox_env: 'py311-nocov' cibw_arch: 'AMD64' cibw_build: 'cp311-*' + cibw_ft: 'false' os: 'windows-latest' - name: 'py311-nocov (macos/arm64)' python: '3.11' @@ -243,6 +260,7 @@ jobs: tox_env: 'py311-nocov' cibw_arch: 'arm64' cibw_build: 'cp311-*' + cibw_ft: 'false' os: 'macos-latest' - name: 'py312-cover (ubuntu/x86_64)' python: '3.12' @@ -278,6 +296,7 @@ jobs: tox_env: 'py312-nocov' cibw_arch: 'x86_64' cibw_build: 'cp312-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py312-nocov (ubuntu/x86_64/musllinux)' python: '3.12' @@ -286,6 +305,7 @@ jobs: tox_env: 'py312-nocov' cibw_arch: 'x86_64' cibw_build: 'cp312-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py312-nocov (ubuntu/aarch64/manylinux)' python: '3.12' @@ -294,6 +314,7 @@ jobs: tox_env: 'py312-nocov' cibw_arch: 'aarch64' cibw_build: 'cp312-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py312-nocov (ubuntu/aarch64/musllinux)' python: '3.12' @@ -302,6 +323,7 @@ jobs: tox_env: 'py312-nocov' cibw_arch: 'aarch64' cibw_build: 'cp312-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py312-nocov (windows/AMD64)' python: '3.12' @@ -310,6 +332,7 @@ jobs: tox_env: 'py312-nocov' cibw_arch: 'AMD64' cibw_build: 'cp312-*' + cibw_ft: 'false' os: 'windows-latest' - name: 'py312-nocov (macos/arm64)' python: '3.12' @@ -318,6 +341,169 @@ jobs: tox_env: 'py312-nocov' cibw_arch: 'arm64' cibw_build: 'cp312-*' + cibw_ft: 'false' + os: 'macos-latest' + - name: 'py313-cover (ubuntu/x86_64)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-cover' + cover: true + cibw_arch: 'x86_64' + cibw_build: false + os: 'ubuntu-latest' + - name: 'py313-cover (windows/AMD64)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-cover' + cover: true + cibw_arch: 'AMD64' + cibw_build: false + os: 'windows-latest' + - name: 'py313-cover (macos/arm64)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'arm64' + tox_env: 'py313-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'py313-nocov (ubuntu/x86_64/manylinux)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (ubuntu/x86_64/musllinux)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (ubuntu/aarch64/manylinux)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (ubuntu/aarch64/musllinux)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (windows/AMD64)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'AMD64' + cibw_build: 'cp313-*' + cibw_ft: 'false' + os: 'windows-latest' + - name: 'py313-nocov (macos/arm64)' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'arm64' + tox_env: 'py313-nocov' + cibw_arch: 'arm64' + cibw_build: 'cp313-*' + cibw_ft: 'false' + os: 'macos-latest' + - name: 'py313ft-cover (ubuntu/x86_64)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-cover' + cover: true + cibw_arch: 'x86_64' + cibw_build: false + os: 'ubuntu-latest' + - name: 'py313ft-cover (windows/AMD64)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-cover' + cover: true + cibw_arch: 'AMD64' + cibw_build: false + os: 'windows-latest' + - name: 'py313ft-cover (macos/arm64)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'arm64-freethreaded' + tox_env: 'py313ft-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'py313ft-nocov (ubuntu/x86_64/manylinux)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313ftt-*manylinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313ft-nocov (ubuntu/x86_64/musllinux)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313ftt-*musllinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313ft-nocov (ubuntu/aarch64/manylinux)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313ftt-*manylinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313ft-nocov (ubuntu/aarch64/musllinux)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313ftt-*musllinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313ft-nocov (windows/AMD64)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'x64-freethreaded' + tox_env: 'py313ft-nocov' + cibw_arch: 'AMD64' + cibw_build: 'cp313ftt-*' + cibw_ft: 'true' + os: 'windows-latest' + - name: 'py313ft-nocov (macos/arm64)' + python: '3.13ft' + toxpython: 'python3.13ft' + python_arch: 'arm64-freethreaded' + tox_env: 'py313ft-nocov' + cibw_arch: 'arm64' + cibw_build: 'cp313ftt-*' + cibw_ft: 'true' os: 'macos-latest' - name: 'pypy39-cover (ubuntu/x86_64)' python: 'pypy-3.9' @@ -452,6 +638,7 @@ jobs: TOXPYTHON: '${{ matrix.toxpython }}' CIBW_ARCHS: '${{ matrix.cibw_arch }}' CIBW_BUILD: '${{ matrix.cibw_build }}' + CIBW_FREE_THREADED_SUPPORT: '${{ matrix.cibw_ft }}' CIBW_BUILD_VERBOSITY: '3' CIBW_TEST_REQUIRES: > tox diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml index fb89fec..2735dbd 100644 --- a/ci/templates/.github/workflows/github-actions.yml +++ b/ci/templates/.github/workflows/github-actions.yml @@ -21,6 +21,7 @@ jobs: os: 'ubuntu-latest' {% for env in tox_environments %} {% set prefix = env.split('-')[0] -%} +{% set nogil = 'ft' in env %} {% if prefix.startswith('pypy') %} {% set python %}pypy-{{ prefix[4] }}.{{ prefix[5:] }}{% endset %} {% set cpython %}pp{{ prefix[4:5] }}{% endset %} @@ -44,14 +45,15 @@ jobs: - name: '{{ env }} ({{ os }}/{{ cibw_arch }}{{ name_suffix }})' python: '{{ python }}' toxpython: '{{ toxpython }}' - python_arch: '{{ python_arch }}' + python_arch: '{{ python_arch }}{% if nogil %}-freethreaded{% endif %}' tox_env: '{{ env }}' {% if 'cover' in env %} cover: true {% endif %} cibw_arch: '{{ cibw_arch }}' {% if 'nocov' in env and not prefix.startswith('pypy') %} - cibw_build: '{{ cpython }}-{{ wheel_arch }}' + cibw_build: '{{ cpython }}{% if nogil %}t{% endif %}-{{ wheel_arch }}' + cibw_ft: '{% if nogil %}true{% else %}false{% endif %}' {% else %} cibw_build: false {% endif %} @@ -90,6 +92,7 @@ jobs: TOXPYTHON: '{{ '${{ matrix.toxpython }}' }}' CIBW_ARCHS: '{{ '${{ matrix.cibw_arch }}' }}' CIBW_BUILD: '{{ '${{ matrix.cibw_build }}' }}' + CIBW_FREE_THREADED_SUPPORT: '{{ '${{ matrix.cibw_ft }}' }}' CIBW_BUILD_VERBOSITY: '3' CIBW_TEST_REQUIRES: > tox diff --git a/setup.py b/setup.py index d7a0044..083dc0d 100755 --- a/setup.py +++ b/setup.py @@ -109,6 +109,7 @@ def read(*names, **kwargs): 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', # uncomment if you test on these interpreters: diff --git a/tox.ini b/tox.ini index 3c6c6af..d0c9ff8 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ envlist = clean, check, docs, - {py39,py310,py311,py312,py312t,pypy39,pypy310}-{cover,nocov}, + {py39,py310,py311,py312,py313,py313ft,pypy39,pypy310}-{cover,nocov}, report ignore_basepython_conflict = true @@ -26,7 +26,8 @@ basepython = py310: {env:TOXPYTHON:python3.10} py311: {env:TOXPYTHON:python3.11} py312: {env:TOXPYTHON:python3.12} - py313t: {env:TOXPYTHON:python3.13t} + py313: {env:TOXPYTHON:python3.13} + py313ft: {env:TOXPYTHON:python3.13t} {bootstrap,clean,check,report,docs,codecov,coveralls,extension-coveralls}: {env:TOXPYTHON:python3} setenv = PYTHONPATH={toxinidir}/tests