Skip to content

Commit d458b4f

Browse files
authored
Merge branch 'master' into dependabot/github_actions/github/codeql-action-4.31.2
2 parents 408e914 + dd0cdd0 commit d458b4f

File tree

7 files changed

+18
-28
lines changed

7 files changed

+18
-28
lines changed

.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: 2 additions & 6 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'
@@ -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]
@@ -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'
@@ -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]

.github/workflows/conda-package.yml

Lines changed: 6 additions & 13 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
@@ -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 }}
@@ -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
@@ -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 }}
@@ -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: |

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ 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+
### Removed
10+
* Dropped support for Python 3.9 [gh-243](https://github.com/IntelPython/mkl_fft/pull/243)
11+
712
## [2.1.1] - 2025-10-09
813

914
### Fixed

mkl_fft/tests/third_party/scipy/test_basic.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
except ImportError:
1818
pytest.skip("This test file needs scipy", allow_module_level=True)
1919
else:
20-
if np.lib.NumpyVersion(scipy.__version__) < "1.12.0":
21-
# scipy from Intel channel is 1.10 with python 3.9 and 3.10
22-
pytest.skip("This test file needs scipy>=1.12", allow_module_level=True)
23-
elif np.lib.NumpyVersion(scipy.__version__) < "1.14.0":
20+
if np.lib.NumpyVersion(scipy.__version__) < "1.14.0":
2421
# For python-3.11 and 3.12, scipy<1.14 is installed from Intel channel
2522
# For python<=3.9, scipy<1.14 is installed from conda channel
2623
# pylint: disable=no-name-in-module

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ classifiers = [
3838
"Programming Language :: C",
3939
"Programming Language :: Python",
4040
"Programming Language :: Python :: 3",
41-
"Programming Language :: Python :: 3.9",
4241
"Programming Language :: Python :: 3.10",
4342
"Programming Language :: Python :: 3.11",
4443
"Programming Language :: Python :: 3.12",
@@ -57,7 +56,7 @@ keywords = ["DFTI", "FFT", "Fourier", "MKL"]
5756
license = "BSD-3-Clause"
5857
name = "mkl_fft"
5958
readme = {file = "README.md", content-type = "text/markdown"}
60-
requires-python = ">=3.9,<3.14"
59+
requires-python = ">=3.10,<3.14"
6160

6261
[project.optional-dependencies]
6362
scipy_interface = ["scipy>=1.10"]

0 commit comments

Comments
 (0)