Skip to content

Commit b7bc516

Browse files
jharlow-inteljharlow-intel
authored
chore: merge master to dev-milestone
2 parents 3121b76 + f6bd487 commit b7bc516

File tree

12 files changed

+39
-44
lines changed

12 files changed

+39
-44
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @vtavana @ndgrigorian @antonwolfy @xaleryb @ekomarova
1+
* @ndgrigorian @antonwolfy @xaleryb @jharlow-intel

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313

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

1919
env:
2020
ONEAPI_ROOT: /opt/intel/oneapi

‎.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.9', '3.10', '3.11', '3.12', '3.13']
25+
python: ['3.10', '3.11', '3.12', '3.13']
2626
use_pre: ["", "--pre"]
2727

2828
steps:

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
strategy:
2222
matrix:
2323
include:
24-
- python: '3.9'
25-
numpy: '2.0'
2624
- python: '3.10'
2725
numpy: '2.2'
2826
- python: '3.11'
@@ -76,7 +74,7 @@ jobs:
7674
conda-recipe-cf
7775
7876
- name: Upload artifact
79-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
77+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8078
with:
8179
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
8280
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
@@ -87,7 +85,7 @@ jobs:
8785

8886
strategy:
8987
matrix:
90-
python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13']
88+
python_ver: ['3.10', '3.11', '3.12', '3.13']
9189
numpy: ['numpy">=2"']
9290
experimental: [false]
9391
runner: [ubuntu-latest]
@@ -97,7 +95,7 @@ jobs:
9795

9896
steps:
9997
- name: Download artifact
100-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
98+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
10199
with:
102100
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
103101

@@ -158,8 +156,6 @@ jobs:
158156
strategy:
159157
matrix:
160158
include:
161-
- python: '3.9'
162-
numpy: '2.0'
163159
- python: '3.10'
164160
numpy: '2.2'
165161
- python: '3.11'
@@ -215,7 +211,7 @@ jobs:
215211
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
216212
217213
- name: Upload artifact
218-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
214+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
219215
with:
220216
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
221217
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
@@ -229,7 +225,7 @@ jobs:
229225

230226
strategy:
231227
matrix:
232-
python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13']
228+
python_ver: ['3.10', '3.11', '3.12', '3.13']
233229
numpy: ['numpy">=2"']
234230
experimental: [false]
235231
runner: [windows-latest]
@@ -240,7 +236,7 @@ jobs:
240236

241237
steps:
242238
- name: Download artifact
243-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
239+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
244240
with:
245241
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
246242

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

Lines changed: 10 additions & 17 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.9', '3.10', '3.11', '3.12', '3.13']
23+
python: ['3.10', '3.11', '3.12', '3.13']
2424
steps:
2525
- name: Cancel Previous Runs
2626
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -66,7 +66,7 @@ jobs:
6666
conda-recipe
6767
6868
- name: Upload artifact
69-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
69+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7070
with:
7171
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
7272
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
@@ -77,7 +77,7 @@ jobs:
7777

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

8787
steps:
8888
- name: Download artifact
89-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
89+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
9090
with:
9191
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
9292

@@ -141,12 +141,7 @@ jobs:
141141
run: |
142142
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
143143
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest $CHANNELS
144-
if [[ "${{ matrix.python }}" != 3.9* ]]; then
145-
# Intel channel only has scipy=1.10 for Python 3.9, which needs mkl<2025
146-
# while scipy needs to install numpy and mkl_random and mkl_random-1.2.11 requires mkl>=2025
147-
# so avoid installing scipy for Python 3.9 which means third_party/scipy tests will not run
148-
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
149-
fi
144+
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
150145
# Test installed packages
151146
conda list -n ${{ env.TEST_ENV_NAME }}
152147
@@ -161,7 +156,7 @@ jobs:
161156

162157
strategy:
163158
matrix:
164-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
159+
python: ['3.10', '3.11', '3.12', '3.13']
165160
steps:
166161
- name: Cancel Previous Runs
167162
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -211,7 +206,7 @@ jobs:
211206
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
212207
213208
- name: Upload artifact
214-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
209+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
215210
with:
216211
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
217212
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
@@ -225,7 +220,7 @@ jobs:
225220

226221
strategy:
227222
matrix:
228-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
223+
python: ['3.10', '3.11', '3.12', '3.13']
229224
experimental: [false]
230225
runner: [windows-latest]
231226
continue-on-error: ${{ matrix.experimental }}
@@ -235,7 +230,7 @@ jobs:
235230

236231
steps:
237232
- name: Download artifact
238-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
233+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
239234
with:
240235
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
241236

@@ -315,10 +310,8 @@ jobs:
315310
)
316311
SET "TEST_DEPENDENCIES=pytest"
317312
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
318-
if ("${{ matrix.python }}" -ne "3.9") {
319-
conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
313+
conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
320314
}
321-
322315
- name: Report content of test environment
323316
shell: cmd /C CALL {0}
324317
run: |

‎.github/workflows/openssf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ jobs:
6161
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6262
# format to the repository Actions tab.
6363
- name: "Upload artifact"
64-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
64+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6565
with:
6666
name: SARIF file
6767
path: results.sarif
6868
retention-days: 14
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
72+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
7373
with:
7474
sarif_file: results.sarif

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [dev] - YYYY-MM-DD
8+
9+
### Added
10+
* Enabled support of Python 3.14 [gh-234](https://github.com/IntelPython/mkl_fft/pull/234)
11+
12+
### Removed
13+
* Dropped support for Python 3.9 [gh-243](https://github.com/IntelPython/mkl_fft/pull/243)
14+
715
## [2.1.1] - 2025-10-09
816

917
### Fixed

‎conda-recipe-cf/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "2.1.1" %}
1+
{% set version = "2.2.0dev0" %}
22
{% set buildnumber = 0 %}
33

44
package:

‎conda-recipe/meta.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ requirements:
1818
- {{ stdlib('c') }}
1919
host:
2020
- python
21+
- python-gil # [py>=314]
2122
- pip
2223
- setuptools >=77
2324
- mkl-devel
@@ -26,6 +27,7 @@ requirements:
2627
- wheel >=0.41.3
2728
run:
2829
- python
30+
- python-gil # [py>=314]
2931
- mkl-service
3032
- {{ pin_compatible('numpy-base') }}
3133

@@ -34,12 +36,11 @@ test:
3436
- pytest -v --pyargs mkl_fft
3537
requires:
3638
- pytest
37-
- scipy >=1.10
39+
# This is a temporary python restriction
40+
- scipy >=1.10 # [py<314]
3841
imports:
3942
- mkl_fft
4043
- mkl_fft.interfaces
41-
- mkl_fft.interfaces.numpy_fft
42-
- mkl_fft.interfaces.scipy_fft
4344

4445
about:
4546
home: http://github.com/IntelPython/mkl_fft

‎mkl_fft/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.1.1"
1+
__version__ = "2.2.0dev0"

0 commit comments

Comments
 (0)