Skip to content

Commit 5aa1f77

Browse files
ndgrigorianndgrigorian
authored
Merge pull request #2340 from IntelPython/proper-enabling-free-threading-python-in-ci
fix(ci): build free-threaded 3.14 wheels with cp314t ABI to stop upload collision
2 parents 1461b15 + dd5464d commit 5aa1f77

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎.github/workflows/conda-package.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
python_spec: ['']
3131
include:
3232
- python: '3.14'
33-
python_spec: '3.14.* *_cp314'
33+
python_spec: '3.14.* *_cp314t'
3434
steps:
3535
- name: Cancel Previous Runs
3636
uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
@@ -51,9 +51,9 @@ jobs:
5151
with:
5252
path: ~/.conda/pkgs
5353
key:
54-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-${{hashFiles('**/meta.yaml') }}
54+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-${{hashFiles('**/meta.yaml') }}
5555
restore-keys: |
56-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-
56+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-
5757
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
5858
- name: Add conda to system path
5959
run: echo "$CONDA/bin" >> "$GITHUB_PATH"
@@ -84,12 +84,12 @@ jobs:
8484
- name: Upload artifact
8585
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8686
with:
87-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
87+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
8888
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
8989
- name: Upload wheels artifact
9090
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9191
with:
92-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
92+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
9393
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
9494

9595
build_windows:
@@ -105,7 +105,7 @@ jobs:
105105
python_spec: ['']
106106
include:
107107
- python: '3.14'
108-
python_spec: '3.14.* *_cp314'
108+
python_spec: '3.14.* *_cp314t'
109109
steps:
110110
- name: Cancel Previous Runs
111111
uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
@@ -131,9 +131,9 @@ jobs:
131131
with:
132132
path: /home/runner/conda_pkgs_dir
133133
key:
134-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-${{hashFiles('**/meta.yaml') }}
134+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-${{hashFiles('**/meta.yaml') }}
135135
restore-keys: |
136-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-
136+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-
137137
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
138138
- name: Store conda paths as envs
139139
shell: bash -l {0}
@@ -160,13 +160,13 @@ jobs:
160160
- name: Upload artifact
161161
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
162162
with:
163-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
163+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
164164
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
165165

166166
- name: Upload wheels artifact
167167
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
168168
with:
169-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
169+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
170170
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
171171

172172
test_linux:
@@ -180,7 +180,7 @@ jobs:
180180
python_spec: ['']
181181
include:
182182
- python: '3.14'
183-
python_spec: '3.14.* *_cp314'
183+
python_spec: '3.14.* *_cp314t'
184184
experimental: false
185185
runner: ubuntu-22.04
186186
experimental: [false]
@@ -197,7 +197,7 @@ jobs:
197197
- name: Download artifact
198198
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
199199
with:
200-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
200+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
201201
- name: Add conda to system path
202202
run: echo "$CONDA/bin" >> "$GITHUB_PATH"
203203
- name: Update conda
@@ -244,9 +244,9 @@ jobs:
244244
with:
245245
path: ~/.conda/pkgs
246246
key:
247-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-${{hashFiles('lockfile') }}
247+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-${{hashFiles('lockfile') }}
248248
restore-keys: |
249-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-
249+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-
250250
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
251251
- name: Install dpctl
252252
run: |
@@ -295,7 +295,7 @@ jobs:
295295
python_spec: ['']
296296
include:
297297
- python: '3.14'
298-
python_spec: '3.14.* *_cp314'
298+
python_spec: '3.14.* *_cp314t'
299299
experimental: false
300300
runner: windows-latest
301301
experimental: [false]
@@ -317,7 +317,7 @@ jobs:
317317
- name: Download artifact
318318
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
319319
with:
320-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
320+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
321321

322322
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
323323
with:
@@ -397,9 +397,9 @@ jobs:
397397
with:
398398
path: /home/runner/conda_pkgs_dir
399399
key:
400-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-${{hashFiles('lockfile') }}
400+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-${{hashFiles('lockfile') }}
401401
restore-keys: |
402-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-
402+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-
403403
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
404404
405405
- name: Install opencl_rt
@@ -484,17 +484,17 @@ jobs:
484484
python_spec: ['']
485485
include:
486486
- python: '3.14'
487-
python_spec: '3.14.* *_cp314'
487+
python_spec: '3.14.* *_cp314t'
488488
steps:
489489
- name: Download conda artifact
490490
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
491491
with:
492-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
492+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
493493

494494
- name: Download wheel artifact
495495
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
496496
with:
497-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
497+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
498498

499499
- name: Install anaconda-client
500500
run: conda install anaconda-client -c conda-forge --override-channels
@@ -531,17 +531,17 @@ jobs:
531531
python_spec: ['']
532532
include:
533533
- python: '3.14'
534-
python_spec: '3.14.* *_cp314'
534+
python_spec: '3.14.* *_cp314t'
535535
steps:
536536
- name: Download artifact
537537
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
538538
with:
539-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
539+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
540540

541541
- name: Download wheel artifact
542542
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
543543
with:
544-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
544+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
545545

546546
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
547547
with:
@@ -578,7 +578,7 @@ jobs:
578578
runner: [ubuntu-latest]
579579
include:
580580
- python: '3.14'
581-
python_spec: '3.14.* *_cp314'
581+
python_spec: '3.14.* *_cp314t'
582582
experimental: false
583583
runner: ubuntu-latest
584584
continue-on-error: ${{ matrix.experimental }}
@@ -606,7 +606,7 @@ jobs:
606606
- name: Download artifact
607607
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
608608
with:
609-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (matrix.python_spec != '' && '3.14' || '3.14t') || matrix.python }}
609+
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python == '3.14' && (contains(matrix.python_spec, 'cp314t') && '3.14t' || '3.14') || matrix.python }}
610610
- name: Add conda to system path
611611
run: echo "$CONDA/bin" >> "$GITHUB_PATH"
612612
- name: Create conda channel
@@ -642,9 +642,9 @@ jobs:
642642
with:
643643
path: ~/.conda/pkgs
644644
key:
645-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-${{hashFiles('lockfile') }}
645+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-${{hashFiles('lockfile') }}
646646
restore-keys: |
647-
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && matrix.python_spec == '' && 't' || '' }}-
647+
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-spec-${{ matrix.python == '3.14' && contains(matrix.python_spec, 'cp314t') && 't' || '' }}-
648648
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
649649
- name: Install example requirements
650650
shell: bash -ex -l {0}

‎.github/workflows/run-tests-from-dppy-bits.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
python_spec: ['']
3232
include:
3333
- python: '3.14'
34-
python_spec: '3.14.* *_cp314'
34+
python_spec: '3.14.* *_cp314t'
3535
experimental: [false]
3636
runner: [ubuntu-22.04, ubuntu-24.04]
3737
continue-on-error: ${{ matrix.experimental }}
@@ -90,7 +90,7 @@ jobs:
9090
python_spec: ['']
9191
include:
9292
- python: '3.14'
93-
python_spec: '3.14.* *_cp314'
93+
python_spec: '3.14.* *_cp314t'
9494
experimental: [false]
9595
runner: [windows-latest]
9696

0 commit comments

Comments
 (0)