Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-with-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:

strategy:
matrix:
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
numpy_version: ["numpy'<2'", "numpy'>=2'"]
python: ["3.10", "3.11", "3.12", "3.13"]
numpy_version: ["numpy'>=2'"]

env:
ONEAPI_ROOT: /opt/intel/oneapi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_pip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.10', '3.11', '3.12', '3.13']
use_pre: ["", "--pre"]

steps:
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/conda-package-cf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
strategy:
matrix:
include:
- python: '3.9'
numpy: '2.0'
- python: '3.10'
numpy: '2.2'
- python: '3.11'
Expand Down Expand Up @@ -87,7 +85,7 @@ jobs:

strategy:
matrix:
python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13']
python_ver: ['3.10', '3.11', '3.12', '3.13']
numpy: ['numpy">=2"']
experimental: [false]
runner: [ubuntu-latest]
Expand Down Expand Up @@ -158,8 +156,6 @@ jobs:
strategy:
matrix:
include:
- python: '3.9'
numpy: '2.0'
- python: '3.10'
numpy: '2.2'
- python: '3.11'
Expand Down Expand Up @@ -229,7 +225,7 @@ jobs:

strategy:
matrix:
python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13']
python_ver: ['3.10', '3.11', '3.12', '3.13']
numpy: ['numpy">=2"']
experimental: [false]
runner: [windows-latest]
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.10', '3.11', '3.12', '3.13']
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:

strategy:
matrix:
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.10', '3.11', '3.12', '3.13']
experimental: [false]
runner: [ubuntu-latest]
continue-on-error: ${{ matrix.experimental }}
Expand Down Expand Up @@ -141,12 +141,7 @@ jobs:
run: |
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest $CHANNELS
if [[ "${{ matrix.python }}" != 3.9* ]]; then
# Intel channel only has scipy=1.10 for Python 3.9, which needs mkl<2025
# while scipy needs to install numpy and mkl_random and mkl_random-1.2.11 requires mkl>=2025
# so avoid installing scipy for Python 3.9 which means third_party/scipy tests will not run
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
fi
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
# Test installed packages
conda list -n ${{ env.TEST_ENV_NAME }}

Expand All @@ -161,7 +156,7 @@ jobs:

strategy:
matrix:
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.10', '3.11', '3.12', '3.13']
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
Expand Down Expand Up @@ -225,7 +220,7 @@ jobs:

strategy:
matrix:
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.10', '3.11', '3.12', '3.13']
experimental: [false]
runner: [windows-latest]
continue-on-error: ${{ matrix.experimental }}
Expand Down Expand Up @@ -315,10 +310,8 @@ jobs:
)
SET "TEST_DEPENDENCIES=pytest"
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
if ("${{ matrix.python }}" -ne "3.9") {
conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
conda install -n ${{ env.TEST_ENV_NAME }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
}

- name: Report content of test environment
shell: cmd /C CALL {0}
run: |
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [dev] - YYYY-MM-DD

### Removed
* Dropped support for Python 3.9 [gh-243](https://github.com/IntelPython/mkl_fft/pull/243)

## [2.1.1] - 2025-10-09

### Fixed
Expand Down
5 changes: 1 addition & 4 deletions mkl_fft/tests/third_party/scipy/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
except ImportError:
pytest.skip("This test file needs scipy", allow_module_level=True)
else:
if np.lib.NumpyVersion(scipy.__version__) < "1.12.0":
# scipy from Intel channel is 1.10 with python 3.9 and 3.10
pytest.skip("This test file needs scipy>=1.12", allow_module_level=True)
elif np.lib.NumpyVersion(scipy.__version__) < "1.14.0":
if np.lib.NumpyVersion(scipy.__version__) < "1.14.0":
# For python-3.11 and 3.12, scipy<1.14 is installed from Intel channel
# For python<=3.9, scipy<1.14 is installed from conda channel
# pylint: disable=no-name-in-module
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ classifiers = [
"Programming Language :: C",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand All @@ -57,7 +56,7 @@ keywords = ["DFTI", "FFT", "Fourier", "MKL"]
license = "BSD-3-Clause"
name = "mkl_fft"
readme = {file = "README.md", content-type = "text/markdown"}
requires-python = ">=3.9,<3.14"
requires-python = ">=3.10,<3.14"

[project.optional-dependencies]
scipy_interface = ["scipy>=1.10"]
Expand Down
Loading