Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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: 3 additions & 1 deletion .github/workflows/build-with-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

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

env:
Expand Down Expand Up @@ -47,6 +47,8 @@ jobs:
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: ${{ matrix.python }}
# allow the 3.15 release candidate until 3.15 is final
allow-prereleases: true
architecture: x64

- name: Checkout repo
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-with-standard-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

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

env:
Expand All @@ -39,6 +39,8 @@ jobs:
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: ${{ matrix.python }}
# allow the 3.15 release candidate until 3.15 is final
allow-prereleases: true
architecture: x64

- name: Checkout repo
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build_pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
python: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
use_pre: ["", "--pre"]

steps:
Expand All @@ -30,7 +30,8 @@ jobs:
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
with:
miniforge-version: latest
channels: conda-forge
# conda-forge/label/python_rc carries the 3.15 release candidate
channels: conda-forge,conda-forge/label/python_rc
activate-environment: test
python-version: ${{ matrix.python }}

Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/conda-package-cf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
numpy: "2.3"
- python: "3.14"
numpy: "2.3"
- python: "3.15"
numpy: "2.5"

steps:
- name: Cancel Previous Runs
Expand Down Expand Up @@ -68,7 +70,7 @@ jobs:

- name: Build conda package with NumPy 2.x
run: |
CHANNELS=(-c conda-forge --override-channels)
CHANNELS=(-c conda-forge -c conda-forge/label/python_rc --override-channels)
VERSIONS=(--python "${{ matrix.python }}" --numpy "${{ matrix.numpy }}")
TEST=(--no-test)

Expand All @@ -90,13 +92,13 @@ jobs:

strategy:
matrix:
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
python: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
numpy: ['numpy">=2"']
experimental: [false]
runner: [ubuntu-latest]
continue-on-error: ${{ matrix.experimental }}
env:
CHANNELS: -c conda-forge --override-channels
CHANNELS: -c conda-forge -c conda-forge/label/python_rc --override-channels

steps:
- name: Download artifact
Expand Down Expand Up @@ -173,6 +175,8 @@ jobs:
numpy: "2.3"
- python: "3.14"
numpy: "2.3"
- python: "3.15"
numpy: "2.5"

steps:
- name: Cancel Previous Runs
Expand All @@ -189,7 +193,7 @@ jobs:
with:
miniforge-version: latest
activate-environment: build
channels: conda-forge
channels: conda-forge,conda-forge/label/python_rc
python-version: ${{ matrix.python }}

- name: Install conda-build
Expand All @@ -211,7 +215,7 @@ jobs:

- name: Build conda package with NumPy 2.x
run: |
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge --override-channels conda-recipe-cf
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge -c conda-forge/label/python_rc --override-channels conda-recipe-cf

- name: Store conda paths as envs
shell: bash -l {0}
Expand All @@ -233,14 +237,14 @@ jobs:

strategy:
matrix:
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
python: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
numpy: ['numpy">=2"']
experimental: [false]
runner: [windows-latest]
continue-on-error: ${{ matrix.experimental }}
env:
workdir: '${{ github.workspace }}'
CHANNELS: -c conda-forge --override-channels
CHANNELS: -c conda-forge -c conda-forge/label/python_rc --override-channels

steps:
- name: Download artifact
Expand All @@ -251,7 +255,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
with:
miniforge-version: latest
channels: conda-forge
channels: conda-forge,conda-forge/label/python_rc
activate-environment: ${{ env.TEST_ENV_NAME }}
python-version: ${{ matrix.python }}

Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ jobs:
numpy: "2.3"
- python: "3.14"
numpy: "2.3"
- python: "3.15"
numpy: "2.5"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
Expand Down Expand Up @@ -85,7 +87,7 @@ jobs:

- name: Build conda package
run: |
CHANNELS=(-c https://software.repos.intel.com/python/conda -c conda-forge --override-channels)
CHANNELS=(-c https://software.repos.intel.com/python/conda -c conda-forge -c conda-forge/label/python_rc --override-channels)
VERSIONS=(--python "${{ matrix.python }}" --numpy "${{ matrix.numpy }}")
TEST=(--no-test)

Expand Down Expand Up @@ -113,13 +115,13 @@ jobs:

strategy:
matrix:
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
python: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
numpy: ['numpy">=2"']
experimental: [false]
runner: [ubuntu-latest]
continue-on-error: ${{ matrix.experimental }}
env:
CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels
CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge -c conda-forge/label/python_rc --override-channels

steps:
- name: Download artifact
Expand Down Expand Up @@ -217,6 +219,8 @@ jobs:
numpy: "2.3"
- python: "3.14"
numpy: "2.3"
- python: "3.15"
numpy: "2.5"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # 0.13.1
Expand All @@ -233,7 +237,7 @@ jobs:
auto-update-conda: true
miniforge-version: latest
activate-environment: build
channels: conda-forge
channels: conda-forge,conda-forge/label/python_rc
python-version: ${{ matrix.python }}
conda-build-version: ${{ env.CONDA_BUILD_VERSION }}

Expand Down Expand Up @@ -265,7 +269,7 @@ jobs:

- name: Build conda package
run: |
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels conda-recipe
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c https://software.repos.intel.com/python/conda -c conda-forge -c conda-forge/label/python_rc --override-channels conda-recipe

- name: Upload artifact
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
Expand All @@ -288,14 +292,14 @@ jobs:

strategy:
matrix:
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
python: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
numpy: ['numpy">=2"']
experimental: [false]
runner: [windows-latest]
continue-on-error: ${{ matrix.experimental }}
env:
workdir: '${{ github.workspace }}'
CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels
CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge -c conda-forge/label/python_rc --override-channels

steps:
- name: Download artifact
Expand All @@ -307,7 +311,7 @@ jobs:
with:
auto-update-conda: true
miniforge-version: latest
channels: conda-forge
channels: conda-forge,conda-forge/label/python_rc
activate-environment: ${{ env.TEST_ENV_NAME }}
python-version: ${{ matrix.python }}

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [dev] - YYYY-MM-DD

### Added
* Enabled support of Python 3.15 [gh-378](https://github.com/IntelPython/mkl_fft/pull/378)

### Changed
* Multi-iterator constructors now return a status corresponding to allocation success or failure, and raise `MemoryError` instead of `ValueError` [gh-373](https://github.com/IntelPython/mkl_fft/pull/373)
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Software Development",
"Topic :: Scientific/Engineering",
Expand All @@ -62,7 +63,7 @@ keywords = ["DFTI", "FFT", "Fourier", "MKL"]
license = "BSD-3-Clause"
name = "mkl_fft"
readme = {file = "README.md", content-type = "text/markdown"}
requires-python = ">=3.10,<3.15"
requires-python = ">=3.10,<3.16"

[project.optional-dependencies]
benchmark = ["asv>=0.6", "psutil", "scipy>=1.10"]
Expand Down
Loading