Skip to content

Commit af87d18

Browse files
ionelmcionelmc
committed
Remove deprecated option and test if this will use the 3.14RC.
1 parent e1b743f commit af87d18

File tree

2 files changed

+45
-65
lines changed

2 files changed

+45
-65
lines changed

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

Lines changed: 45 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,7 @@ jobs:
505505
os: 'macos-latest'
506506
- name: 'py314-cover (ubuntu/x86_64)'
507507
artifact: 'py314-ubuntu-x86_64'
508-
python: '3.14-dev'
509-
toxpython: 'python3.14'
508+
python: '3.14'
510509
python_arch: 'x64'
511510
tox_env: 'py314-cover'
512511
cover: true
@@ -515,8 +514,7 @@ jobs:
515514
os: 'ubuntu-latest'
516515
- name: 'py314-cover (windows/AMD64)'
517516
artifact: 'py314-windows-AMD64'
518-
python: '3.14-dev'
519-
toxpython: 'python3.14'
517+
python: '3.14'
520518
python_arch: 'x64'
521519
tox_env: 'py314-cover'
522520
cover: true
@@ -525,8 +523,7 @@ jobs:
525523
os: 'windows-latest'
526524
- name: 'py314-cover (macos/arm64)'
527525
artifact: 'py314-macos-arm64'
528-
python: '3.14-dev'
529-
toxpython: 'python3.14'
526+
python: '3.14'
530527
python_arch: 'arm64'
531528
tox_env: 'py314-cover'
532529
cover: true
@@ -535,8 +532,7 @@ jobs:
535532
os: 'macos-latest'
536533
- name: 'py314-nocov (ubuntu/x86_64/manylinux)'
537534
artifact: 'py314-ubuntu-x86_64-manylinux'
538-
python: '3.14-dev'
539-
toxpython: 'python3.14'
535+
python: '3.14'
540536
python_arch: 'x64'
541537
tox_env: 'py314-nocov'
542538
cibw_arch: 'x86_64'
@@ -545,8 +541,7 @@ jobs:
545541
os: 'ubuntu-latest'
546542
- name: 'py314-nocov (ubuntu/x86_64/musllinux)'
547543
artifact: 'py314-ubuntu-x86_64-musllinux'
548-
python: '3.14-dev'
549-
toxpython: 'python3.14'
544+
python: '3.14'
550545
python_arch: 'x64'
551546
tox_env: 'py314-nocov'
552547
cibw_arch: 'x86_64'
@@ -555,8 +550,7 @@ jobs:
555550
os: 'ubuntu-latest'
556551
- name: 'py314-nocov (ubuntu/aarch64/manylinux)'
557552
artifact: 'py314-ubuntu-aarch64-manylinux'
558-
python: '3.14-dev'
559-
toxpython: 'python3.14'
553+
python: '3.14'
560554
python_arch: 'x64'
561555
tox_env: 'py314-nocov'
562556
cibw_arch: 'aarch64'
@@ -565,8 +559,7 @@ jobs:
565559
os: 'ubuntu-latest'
566560
- name: 'py314-nocov (ubuntu/aarch64/musllinux)'
567561
artifact: 'py314-ubuntu-aarch64-musllinux'
568-
python: '3.14-dev'
569-
toxpython: 'python3.14'
562+
python: '3.14'
570563
python_arch: 'x64'
571564
tox_env: 'py314-nocov'
572565
cibw_arch: 'aarch64'
@@ -575,8 +568,7 @@ jobs:
575568
os: 'ubuntu-latest'
576569
- name: 'py314-nocov (windows/AMD64)'
577570
artifact: 'py314-windows-AMD64'
578-
python: '3.14-dev'
579-
toxpython: 'python3.14'
571+
python: '3.14'
580572
python_arch: 'x64'
581573
tox_env: 'py314-nocov'
582574
cibw_arch: 'AMD64'
@@ -585,100 +577,90 @@ jobs:
585577
os: 'windows-latest'
586578
- name: 'py314-nocov (macos/arm64)'
587579
artifact: 'py314-macos-arm64'
588-
python: '3.14-dev'
589-
toxpython: 'python3.14'
580+
python: '3.14'
590581
python_arch: 'arm64'
591582
tox_env: 'py314-nocov'
592583
cibw_arch: 'arm64'
593584
cibw_build: 'cp314-*'
594585
cibw_ft: 'false'
595586
os: 'macos-latest'
596-
- name: 'py314-ft-cover (ubuntu/x86_64)'
597-
artifact: 'py314-ft-ubuntu-x86_64'
598-
python: '3.14-dev'
599-
toxpython: 'python3.14t'
587+
- name: 'py314t-cover (ubuntu/x86_64)'
588+
artifact: 'py314t-ubuntu-x86_64'
589+
python: '3.14'
600590
python_arch: 'x64-freethreaded'
601-
tox_env: 'py314-ft-cover'
591+
tox_env: 'py314t-cover'
602592
cover: true
603593
cibw_arch: 'x86_64'
604594
cibw_build: false
605595
os: 'ubuntu-latest'
606-
- name: 'py314-ft-cover (windows/AMD64)'
607-
artifact: 'py314-ft-windows-AMD64'
608-
python: '3.14-dev'
609-
toxpython: 'python3.14t'
596+
- name: 'py314t-cover (windows/AMD64)'
597+
artifact: 'py314t-windows-AMD64'
598+
python: '3.14'
610599
python_arch: 'x64-freethreaded'
611-
tox_env: 'py314-ft-cover'
600+
tox_env: 'py314t-cover'
612601
cover: true
613602
cibw_arch: 'AMD64'
614603
cibw_build: false
615604
os: 'windows-latest'
616-
- name: 'py314-ft-cover (macos/arm64)'
617-
artifact: 'py314-ft-macos-arm64'
618-
python: '3.14-dev'
619-
toxpython: 'python3.14t'
605+
- name: 'py314t-cover (macos/arm64)'
606+
artifact: 'py314t-macos-arm64'
607+
python: '3.14'
620608
python_arch: 'arm64-freethreaded'
621-
tox_env: 'py314-ft-cover'
609+
tox_env: 'py314t-cover'
622610
cover: true
623611
cibw_arch: 'arm64'
624612
cibw_build: false
625613
os: 'macos-latest'
626-
- name: 'py314-ft-nocov (ubuntu/x86_64/manylinux)'
627-
artifact: 'py314-ft-ubuntu-x86_64-manylinux'
628-
python: '3.14-dev'
629-
toxpython: 'python3.14t'
614+
- name: 'py314t-nocov (ubuntu/x86_64/manylinux)'
615+
artifact: 'py314t-ubuntu-x86_64-manylinux'
616+
python: '3.14'
630617
python_arch: 'x64-freethreaded'
631-
tox_env: 'py314-ft-nocov'
618+
tox_env: 'py314t-nocov'
632619
cibw_arch: 'x86_64'
633620
cibw_build: 'cp314t-*manylinux*'
634621
cibw_ft: 'true'
635622
os: 'ubuntu-latest'
636-
- name: 'py314-ft-nocov (ubuntu/x86_64/musllinux)'
637-
artifact: 'py314-ft-ubuntu-x86_64-musllinux'
638-
python: '3.14-dev'
639-
toxpython: 'python3.14t'
623+
- name: 'py314t-nocov (ubuntu/x86_64/musllinux)'
624+
artifact: 'py314t-ubuntu-x86_64-musllinux'
625+
python: '3.14'
640626
python_arch: 'x64-freethreaded'
641-
tox_env: 'py314-ft-nocov'
627+
tox_env: 'py314t-nocov'
642628
cibw_arch: 'x86_64'
643629
cibw_build: 'cp314t-*musllinux*'
644630
cibw_ft: 'true'
645631
os: 'ubuntu-latest'
646-
- name: 'py314-ft-nocov (ubuntu/aarch64/manylinux)'
647-
artifact: 'py314-ft-ubuntu-aarch64-manylinux'
648-
python: '3.14-dev'
649-
toxpython: 'python3.14t'
632+
- name: 'py314t-nocov (ubuntu/aarch64/manylinux)'
633+
artifact: 'py314t-ubuntu-aarch64-manylinux'
634+
python: '3.14'
650635
python_arch: 'x64-freethreaded'
651-
tox_env: 'py314-ft-nocov'
636+
tox_env: 'py314t-nocov'
652637
cibw_arch: 'aarch64'
653638
cibw_build: 'cp314t-*manylinux*'
654639
cibw_ft: 'true'
655640
os: 'ubuntu-latest'
656-
- name: 'py314-ft-nocov (ubuntu/aarch64/musllinux)'
657-
artifact: 'py314-ft-ubuntu-aarch64-musllinux'
658-
python: '3.14-dev'
659-
toxpython: 'python3.14t'
641+
- name: 'py314t-nocov (ubuntu/aarch64/musllinux)'
642+
artifact: 'py314t-ubuntu-aarch64-musllinux'
643+
python: '3.14'
660644
python_arch: 'x64-freethreaded'
661-
tox_env: 'py314-ft-nocov'
645+
tox_env: 'py314t-nocov'
662646
cibw_arch: 'aarch64'
663647
cibw_build: 'cp314t-*musllinux*'
664648
cibw_ft: 'true'
665649
os: 'ubuntu-latest'
666-
- name: 'py314-ft-nocov (windows/AMD64)'
667-
artifact: 'py314-ft-windows-AMD64'
668-
python: '3.14-dev'
669-
toxpython: 'python3.14t'
650+
- name: 'py314t-nocov (windows/AMD64)'
651+
artifact: 'py314t-windows-AMD64'
652+
python: '3.14'
670653
python_arch: 'x64-freethreaded'
671-
tox_env: 'py314-ft-nocov'
654+
tox_env: 'py314t-nocov'
672655
cibw_arch: 'AMD64'
673656
cibw_build: 'cp314t-*'
674657
cibw_ft: 'true'
675658
os: 'windows-latest'
676-
- name: 'py314-ft-nocov (macos/arm64)'
677-
artifact: 'py314-ft-macos-arm64'
678-
python: '3.14-dev'
679-
toxpython: 'python3.14t'
659+
- name: 'py314t-nocov (macos/arm64)'
660+
artifact: 'py314t-macos-arm64'
661+
python: '3.14'
680662
python_arch: 'arm64-freethreaded'
681-
tox_env: 'py314-ft-nocov'
663+
tox_env: 'py314t-nocov'
682664
cibw_arch: 'arm64'
683665
cibw_build: 'cp314t-*'
684666
cibw_ft: 'true'
@@ -917,7 +899,6 @@ jobs:
917899
env:
918900
CIBW_ARCHS: '${{ matrix.cibw_arch }}'
919901
CIBW_BUILD: '${{ matrix.cibw_build }}'
920-
CIBW_FREE_THREADED_SUPPORT: '${{ matrix.cibw_ft }}'
921902
CIBW_CONTAINER_ENGINE: "docker; create_args: --cap-add=SYS_PTRACE"
922903
CIBW_ENABLE: cpython-freethreading
923904
CIBW_BUILD_VERBOSITY: '3'

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ jobs:
8989
env:
9090
CIBW_ARCHS: '{{ '${{ matrix.cibw_arch }}' }}'
9191
CIBW_BUILD: '{{ '${{ matrix.cibw_build }}' }}'
92-
CIBW_FREE_THREADED_SUPPORT: '{{ '${{ matrix.cibw_ft }}' }}'
9392
CIBW_CONTAINER_ENGINE: "docker; create_args: --cap-add=SYS_PTRACE"
9493
CIBW_ENABLE: cpython-freethreading
9594
CIBW_BUILD_VERBOSITY: '3'

0 commit comments

Comments
 (0)