Skip to content

Commit 7090de8

Browse files
ionelmcionelmc
committed
Fix some variables for freethread builds.
1 parent 28be668 commit 7090de8

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

‎.github/workflows/github-actions.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -469,94 +469,94 @@ jobs:
469469
cibw_build: 'cp313-*'
470470
cibw_ft: 'false'
471471
os: 'macos-latest'
472-
- name: 'py313ft-cover (ubuntu/x86_64)'
473-
artifact: 'py313ft-ubuntu-x86_64'
474-
python: '3.13ft'
475-
toxpython: 'python3.13ft'
472+
- name: 'py313-ft-cover (ubuntu/x86_64)'
473+
artifact: 'py313-ft-ubuntu-x86_64'
474+
python: '3.13'
475+
toxpython: 'python3.13t'
476476
python_arch: 'x64-freethreaded'
477-
tox_env: 'py313ft-cover'
477+
tox_env: 'py313-ft-cover'
478478
cover: true
479479
cibw_arch: 'x86_64'
480480
cibw_build: false
481481
os: 'ubuntu-latest'
482-
- name: 'py313ft-cover (windows/AMD64)'
483-
artifact: 'py313ft-windows-AMD64'
484-
python: '3.13ft'
485-
toxpython: 'python3.13ft'
482+
- name: 'py313-ft-cover (windows/AMD64)'
483+
artifact: 'py313-ft-windows-AMD64'
484+
python: '3.13'
485+
toxpython: 'python3.13t'
486486
python_arch: 'x64-freethreaded'
487-
tox_env: 'py313ft-cover'
487+
tox_env: 'py313-ft-cover'
488488
cover: true
489489
cibw_arch: 'AMD64'
490490
cibw_build: false
491491
os: 'windows-latest'
492-
- name: 'py313ft-cover (macos/arm64)'
493-
artifact: 'py313ft-macos-arm64'
494-
python: '3.13ft'
495-
toxpython: 'python3.13ft'
492+
- name: 'py313-ft-cover (macos/arm64)'
493+
artifact: 'py313-ft-macos-arm64'
494+
python: '3.13'
495+
toxpython: 'python3.13t'
496496
python_arch: 'arm64-freethreaded'
497-
tox_env: 'py313ft-cover'
497+
tox_env: 'py313-ft-cover'
498498
cover: true
499499
cibw_arch: 'arm64'
500500
cibw_build: false
501501
os: 'macos-latest'
502-
- name: 'py313ft-nocov (ubuntu/x86_64/manylinux)'
503-
artifact: 'py313ft-ubuntu-x86_64-manylinux'
504-
python: '3.13ft'
505-
toxpython: 'python3.13ft'
502+
- name: 'py313-ft-nocov (ubuntu/x86_64/manylinux)'
503+
artifact: 'py313-ft-ubuntu-x86_64-manylinux'
504+
python: '3.13'
505+
toxpython: 'python3.13t'
506506
python_arch: 'x64-freethreaded'
507-
tox_env: 'py313ft-nocov'
507+
tox_env: 'py313-ft-nocov'
508508
cibw_arch: 'x86_64'
509-
cibw_build: 'cp313ftt-*manylinux*'
509+
cibw_build: 'cp313t-*manylinux*'
510510
cibw_ft: 'true'
511511
os: 'ubuntu-latest'
512-
- name: 'py313ft-nocov (ubuntu/x86_64/musllinux)'
513-
artifact: 'py313ft-ubuntu-x86_64-musllinux'
514-
python: '3.13ft'
515-
toxpython: 'python3.13ft'
512+
- name: 'py313-ft-nocov (ubuntu/x86_64/musllinux)'
513+
artifact: 'py313-ft-ubuntu-x86_64-musllinux'
514+
python: '3.13'
515+
toxpython: 'python3.13t'
516516
python_arch: 'x64-freethreaded'
517-
tox_env: 'py313ft-nocov'
517+
tox_env: 'py313-ft-nocov'
518518
cibw_arch: 'x86_64'
519-
cibw_build: 'cp313ftt-*musllinux*'
519+
cibw_build: 'cp313t-*musllinux*'
520520
cibw_ft: 'true'
521521
os: 'ubuntu-latest'
522-
- name: 'py313ft-nocov (ubuntu/aarch64/manylinux)'
523-
artifact: 'py313ft-ubuntu-aarch64-manylinux'
524-
python: '3.13ft'
525-
toxpython: 'python3.13ft'
522+
- name: 'py313-ft-nocov (ubuntu/aarch64/manylinux)'
523+
artifact: 'py313-ft-ubuntu-aarch64-manylinux'
524+
python: '3.13'
525+
toxpython: 'python3.13t'
526526
python_arch: 'x64-freethreaded'
527-
tox_env: 'py313ft-nocov'
527+
tox_env: 'py313-ft-nocov'
528528
cibw_arch: 'aarch64'
529-
cibw_build: 'cp313ftt-*manylinux*'
529+
cibw_build: 'cp313t-*manylinux*'
530530
cibw_ft: 'true'
531531
os: 'ubuntu-latest'
532-
- name: 'py313ft-nocov (ubuntu/aarch64/musllinux)'
533-
artifact: 'py313ft-ubuntu-aarch64-musllinux'
534-
python: '3.13ft'
535-
toxpython: 'python3.13ft'
532+
- name: 'py313-ft-nocov (ubuntu/aarch64/musllinux)'
533+
artifact: 'py313-ft-ubuntu-aarch64-musllinux'
534+
python: '3.13'
535+
toxpython: 'python3.13t'
536536
python_arch: 'x64-freethreaded'
537-
tox_env: 'py313ft-nocov'
537+
tox_env: 'py313-ft-nocov'
538538
cibw_arch: 'aarch64'
539-
cibw_build: 'cp313ftt-*musllinux*'
539+
cibw_build: 'cp313t-*musllinux*'
540540
cibw_ft: 'true'
541541
os: 'ubuntu-latest'
542-
- name: 'py313ft-nocov (windows/AMD64)'
543-
artifact: 'py313ft-windows-AMD64'
544-
python: '3.13ft'
545-
toxpython: 'python3.13ft'
542+
- name: 'py313-ft-nocov (windows/AMD64)'
543+
artifact: 'py313-ft-windows-AMD64'
544+
python: '3.13'
545+
toxpython: 'python3.13t'
546546
python_arch: 'x64-freethreaded'
547-
tox_env: 'py313ft-nocov'
547+
tox_env: 'py313-ft-nocov'
548548
cibw_arch: 'AMD64'
549-
cibw_build: 'cp313ftt-*'
549+
cibw_build: 'cp313t-*'
550550
cibw_ft: 'true'
551551
os: 'windows-latest'
552-
- name: 'py313ft-nocov (macos/arm64)'
553-
artifact: 'py313ft-macos-arm64'
554-
python: '3.13ft'
555-
toxpython: 'python3.13ft'
552+
- name: 'py313-ft-nocov (macos/arm64)'
553+
artifact: 'py313-ft-macos-arm64'
554+
python: '3.13'
555+
toxpython: 'python3.13t'
556556
python_arch: 'arm64-freethreaded'
557-
tox_env: 'py313ft-nocov'
557+
tox_env: 'py313-ft-nocov'
558558
cibw_arch: 'arm64'
559-
cibw_build: 'cp313ftt-*'
559+
cibw_build: 'cp313t-*'
560560
cibw_ft: 'true'
561561
os: 'macos-latest'
562562
- name: 'pypy39-cover (ubuntu/x86_64)'

‎ci/templates/.github/workflows/github-actions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
{% if prefix.startswith('pypy') %}
2626
{% set python %}pypy-{{ prefix[4] }}.{{ prefix[5:] }}{% endset %}
2727
{% set cpython %}pp{{ prefix[4:5] }}{% endset %}
28-
{% set toxpython %}pypy{{ prefix[4] }}.{{ prefix[5:] }}{% endset %}
28+
{% set toxpython %}pypy{{ prefix[4] }}.{{ prefix[5:] }}{{ 't' if nogil else '' }}{% endset %}
2929
{% else %}
3030
{% set python %}{{ prefix[2] }}.{{ prefix[3:] }}{% endset %}
3131
{% set cpython %}cp{{ prefix[2:] }}{% endset %}
32-
{% set toxpython %}python{{ prefix[2] }}.{{ prefix[3:] }}{% endset %}
32+
{% set toxpython %}python{{ prefix[2] }}.{{ prefix[3:] }}{{ 't' if nogil else '' }}{% endset %}
3333
{% endif %}
3434
{% for os, python_arch, cibw_arch, wheel_arch, include_cover in [
3535
['ubuntu', 'x64', 'x86_64', '*manylinux*', True],

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ envlist =
1414
clean,
1515
check,
1616
docs,
17-
{py39,py310,py311,py312,py313,py313ft,pypy39,pypy310}-{cover,nocov},
17+
{py39,py310,py311,py312,py313,py313-ft,pypy39,pypy310}-{cover,nocov},
1818
report
1919
ignore_basepython_conflict = true
2020

0 commit comments

Comments
 (0)