Skip to content

Commit acb0658

Browse files
authored
Merge branch 'master' into add-mkl-fft-patching
2 parents e2184dd + 62dc6b8 commit acb0658

4 files changed

Lines changed: 30 additions & 24 deletions

File tree

.github/workflows/build-with-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
python: ["3.10", "3.11", "3.12", "3.13"]
16+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1717
numpy_version: ["numpy'>=2'"]
1818

1919
env:

.github/workflows/build_pip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
python: ['3.10', '3.11', '3.12', '3.13']
25+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2626
use_pre: ["", "--pre"]
2727

2828
steps:

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ jobs:
2121
strategy:
2222
matrix:
2323
include:
24-
- python: '3.10'
25-
numpy: '2.2'
26-
- python: '3.11'
27-
numpy: '2.3'
28-
- python: '3.12'
29-
numpy: '2.3'
30-
- python: '3.13'
31-
numpy: '2.3'
24+
- python: "3.10"
25+
numpy: "2.2"
26+
- python: "3.11"
27+
numpy: "2.3"
28+
- python: "3.12"
29+
numpy: "2.3"
30+
- python: "3.13"
31+
numpy: "2.3"
32+
- python: "3.14"
33+
numpy: "2.3"
34+
3235
steps:
3336
- name: Cancel Previous Runs
3437
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
@@ -85,7 +88,7 @@ jobs:
8588

8689
strategy:
8790
matrix:
88-
python_ver: ['3.10', '3.11', '3.12', '3.13']
91+
python_ver: ["3.10", "3.11", "3.12", "3.13", "3.14"]
8992
numpy: ['numpy">=2"']
9093
experimental: [false]
9194
runner: [ubuntu-latest]
@@ -156,14 +159,17 @@ jobs:
156159
strategy:
157160
matrix:
158161
include:
159-
- python: '3.10'
160-
numpy: '2.2'
161-
- python: '3.11'
162-
numpy: '2.3'
163-
- python: '3.12'
164-
numpy: '2.3'
165-
- python: '3.13'
166-
numpy: '2.3'
162+
- python: "3.10"
163+
numpy: "2.2"
164+
- python: "3.11"
165+
numpy: "2.3"
166+
- python: "3.12"
167+
numpy: "2.3"
168+
- python: "3.13"
169+
numpy: "2.3"
170+
- python: "3.14"
171+
numpy: "2.3"
172+
167173
steps:
168174
- name: Cancel Previous Runs
169175
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
@@ -225,7 +231,7 @@ jobs:
225231

226232
strategy:
227233
matrix:
228-
python_ver: ['3.10', '3.11', '3.12', '3.13']
234+
python_ver: ["3.10", "3.11", "3.12", "3.13", "3.14"]
229235
numpy: ['numpy">=2"']
230236
experimental: [false]
231237
runner: [windows-latest]

.github/workflows/conda-package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
python: ['3.10', '3.11', '3.12', '3.13']
23+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2424
steps:
2525
- name: Cancel Previous Runs
2626
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
@@ -77,7 +77,7 @@ jobs:
7777

7878
strategy:
7979
matrix:
80-
python: ['3.10', '3.11', '3.12', '3.13']
80+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
8181
experimental: [false]
8282
runner: [ubuntu-latest]
8383
continue-on-error: ${{ matrix.experimental }}
@@ -158,7 +158,7 @@ jobs:
158158

159159
strategy:
160160
matrix:
161-
python: ['3.10', '3.11', '3.12', '3.13']
161+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
162162
steps:
163163
- name: Cancel Previous Runs
164164
uses: styfle/cancel-workflow-action@3155a141048f8f89c06b4cdae32e7853e97536bc # 0.13.0
@@ -222,7 +222,7 @@ jobs:
222222

223223
strategy:
224224
matrix:
225-
python: ['3.10', '3.11', '3.12', '3.13']
225+
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
226226
experimental: [false]
227227
runner: [windows-latest]
228228
continue-on-error: ${{ matrix.experimental }}

0 commit comments

Comments
 (0)