Merge branch 'master' into update-scipy

Author: vtavana

.github/workflows/build_pip.yaml

@@ -40,6 +40,7 @@ jobs:
           use-mamba: true
           miniforge-version: latest
           channels: conda-forge
+          conda-remove-defaults: true
           activate-environment: test
           python-version: ${{ matrix.python }}
 
@@ -57,4 +58,5 @@ jobs:
           echo "CONDA_PREFFIX is '${CONDA_PREFIX}'"
           export MKLROOT=${CONDA_PREFIX}
           pip install -e .[test] --no-build-isolation --verbose
+          pip list
           python -m pytest -v mkl_fft/tests

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

@@ -16,7 +16,7 @@ env:
   VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
 
 jobs:
-  build:
+  build_linux:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -62,8 +62,8 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
 
-  test:
-    needs: build
+  test_linux:
+    needs: build_linux
     runs-on:  ${{ matrix.runner }}
 
     strategy:
@@ -139,10 +139,9 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
-          auto-activate-base: true
           activate-environment: build
           python-version: ${{ matrix.python }}
-          channels: conda-forge,nodefaults
+          channels: conda-forge
           conda-remove-defaults: 'true'
 
       - name: Install conda-build

.github/workflows/conda-package.yml

@@ -16,11 +16,11 @@ env:
   VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
 
 jobs:
-  build:
+  build_linux:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.9', '3.10']
+        python: ['3.9', '3.10', '3.11', '3.12']
     steps:
       - uses: actions/checkout@v4
         with:
@@ -62,13 +62,13 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
 
-  test:
-    needs: build
+  test_linux:
+    needs: build_linux
     runs-on:  ${{ matrix.runner }}
 
     strategy:
       matrix:
-        python: ['3.9', '3.10']
+        python: ['3.9', '3.10', '3.11', '3.12']
         experimental: [false]
         runner: [ubuntu-latest]
     continue-on-error: ${{ matrix.experimental }}
@@ -130,7 +130,7 @@ jobs:
 
     strategy:
       matrix:
-        python: ['3.9', '3.10']
+        python: ['3.9', '3.10', '3.11', '3.12']
     steps:
       - uses: actions/checkout@v4.2.0
         with:
@@ -184,7 +184,7 @@ jobs:
         shell: cmd /C CALL {0}
     strategy:
       matrix:
-        python: ['3.9', '3.10']
+        python: ['3.9', '3.10', '3.11', '3.12']
         experimental: [false]
         runner: [windows-2019]
     continue-on-error: ${{ matrix.experimental }}

CHANGES.rst

@@ -1,5 +1,5 @@
 =================
-mkl_fft changelog
+:code:`mkl_fft` changelog
 =================
 
 1.3.13 (03/25/2025)
@@ -12,7 +12,7 @@ migrate from :code:`setup.py` to :code:`pyproject.toml`
 includes support in virtual environment out of the box
 
 the original :code:`mkl_fft.rfft` and :code:`mkl_fft.irfft` are renamed to :code:`mkl_fft.rfftpack` and :code:`mkl_fft.irfftpack`,
-since they replicate the behavior from the deprectaed :code:`scipy.fftpack` module.
+since they replicate the behavior from the deprecated :code:`scipy.fftpack` module.
 
 :code:`mkl_fft.rfft_numpy`, :code:`mkl_fft.irfft_numpy`, :code:`mkl_fft.rfft2_numpy`, :code:`mkl_fft.irfft2_numpy`,
 :code:`mkl_fft.rfftn_numpy`, and :code:`mkl_fft.irfftn_numpy` are renamed to :code:`mkl_fft.rfft`, :code:`mkl_fft.irfft`,

README.md

@@ -1,4 +1,4 @@
-## ``mkl_fft`` --  a NumPy-based Python interface to Intel (R) MKL FFT functionality
+## `mkl_fft` --  a NumPy-based Python interface to Intel (R) MKL FFT functionality
 [![Conda package](https://github.com/IntelPython/mkl_fft/actions/workflows/conda-package.yml/badge.svg)](https://github.com/IntelPython/mkl_fft/actions/workflows/conda-package.yml)
 [![Editable build using pip and pre-release NumPy](https://github.com/IntelPython/mkl_fft/actions/workflows/build_pip.yaml/badge.svg)](https://github.com/IntelPython/mkl_fft/actions/workflows/build_pip.yaml)
 [![Conda package with conda-forge channel only](https://github.com/IntelPython/mkl_fft/actions/workflows/conda-package-cf.yml/badge.svg)](https://github.com/IntelPython/mkl_fft/actions/workflows/conda-package-cf.yml)
@@ -76,11 +76,11 @@ More details can be found in SciPy 2017 conference proceedings:
 ... and similar `irfft*` functions.
 
 
-The package also provides `mkl_fft._numpy_fft` and `mkl_fft._scipy_fft` interfaces which provide drop-in replacements for equivalent functions in NumPy and SciPy respectively.
+The package also provides `mkl_fft.interfaces.numpy_fft` and `mkl_fft.interfaces.scipy_fft` interfaces which provide drop-in replacements for equivalent functions in NumPy and SciPy respectively.
 
 ---
 
-To build ``mkl_fft`` from sources on Linux:
+To build `mkl_fft` from sources on Linux:
   - install a recent version of MKL, if necessary;
-  - execute ``source /path_to_oneapi/mkl/latest/env/vars.sh``;
-  - execute ``python -m pip install .``
+  - execute `source /path_to_oneapi/mkl/latest/env/vars.sh`;
+  - execute `python -m pip install .`

conda-recipe-cf/meta.yaml

@@ -18,13 +18,12 @@ requirements:
       - {{ compiler('c') }}
     host:
       - python
-      - setuptools
+      - setuptools >=77
       - mkl-devel
       - cython
       - numpy
     run:
       - python
-      - mkl
       - mkl-service
       - numpy
 
@@ -42,6 +41,6 @@ test:
 
 about:
     home: http://github.com/IntelPython/mkl_fft
-    license: BSD-3
+    license: BSD-3-Clause
     license_file: LICENSE.txt
     summary: NumPy-based implementation of Fast Fourier Transform using Intel (R) Math Kernel Library

conda-recipe/meta.yaml

@@ -18,13 +18,12 @@ requirements:
       - {{ compiler('c') }}
     host:
       - python
-      - setuptools
+      - setuptools >=77
       - mkl-devel
       - cython
       - numpy-base
     run:
       - python
-      - mkl
       - mkl-service
       - {{ pin_compatible('numpy') }}
 
@@ -42,6 +41,6 @@ test:
 
 about:
     home: http://github.com/IntelPython/mkl_fft
-    license: BSD-3
+    license: BSD-3-Clause
     license_file: LICENSE.txt
     summary: NumPy-based implementation of Fast Fourier Transform using Intel (R) Math Kernel Library

pyproject.toml

@@ -25,7 +25,7 @@
 
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools>=64", "Cython", "numpy", "mkl-devel"]
+requires = ["setuptools>=77", "Cython", "numpy", "mkl-devel"]
 
 [project]
 authors = [
@@ -35,7 +35,6 @@ classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Science/Research",
   "Intended Audience :: Developers",
-  "License :: OSI Approved",
   "Programming Language :: C",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
@@ -50,11 +49,11 @@ classifiers = [
   "Operating System :: POSIX",
   "Operating System :: Unix"
 ]
-dependencies = ["numpy>=1.26.4", "mkl", "mkl-service"]
+dependencies = ["numpy>=1.26.4", "mkl-service"]
 description = "MKL-based FFT transforms for NumPy arrays"
 dynamic = ["version"]
 keywords = ["DFTI", "FFT", "Fourier", "MKL"]
-license = {text = "BSD"}
+license = "BSD-3-Clause"
 name = "mkl_fft"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.9,<3.13"