Skip to content

Commit 645f528

Browse files
committed
add scipy to runtime dependency
1 parent d3f7e2d commit 645f528

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
- name: Install mkl_fft
133133
run: |
134134
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
135-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} $PACKAGE_NAME pytest scipy $CHANNELS
135+
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} $PACKAGE_NAME pytest $CHANNELS
136136
# Test installed packages
137137
conda list -n ${{ env.TEST_ENV_NAME }}
138138
@@ -295,7 +295,7 @@ jobs:
295295
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
296296
SET PACKAGE_VERSION=%%F
297297
)
298-
SET "TEST_DEPENDENCIES=pytest scipy"
298+
SET "TEST_DEPENDENCIES=pytest"
299299
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
300300
301301
- name: Report content of test environment

.github/workflows/conda-package.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ jobs:
131131
- name: Install mkl_fft
132132
run: |
133133
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
134-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} "scipy>=1.10" $CHANNELS
135-
conda install -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME pytest $CHANNELS
134+
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME python=${{ matrix.python }} pytest $CHANNELS
136135
# Test installed packages
137136
conda list -n ${{ env.TEST_ENV_NAME }}
138137
@@ -296,7 +295,7 @@ jobs:
296295
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
297296
SET PACKAGE_VERSION=%%F
298297
)
299-
SET "TEST_DEPENDENCIES=pytest scipy"
298+
SET "TEST_DEPENDENCIES=pytest"
300299
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
301300
302301
- name: Report content of test environment

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ __pycache__/
77

88
mkl_fft/_pydfti.c
99
mkl_fft/_pydfti.cpython*.so
10+
mkl_fft/_pydfti.*-win_amd64.pyd
1011
mkl_fft/src/mklfft.c

conda-recipe-cf/meta.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ requirements:
2626
- python
2727
- mkl-service
2828
- numpy
29+
- scipy >=1.10.1
2930

3031
test:
3132
commands:

conda-recipe/meta.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ requirements:
2626
- python
2727
- mkl-service
2828
- {{ pin_compatible('numpy') }}
29+
- scipy >=1.10.1
2930

3031
test:
3132
commands:

mkl_fft/tests/third_party/scipy/test_basic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
from pytest import raises as assert_raises
1414

1515
# pylint: disable=possibly-used-before-assignment
16-
if scipy.__version__ < "1.12":
16+
if np.lib.NumpyVersion(scipy.__version__ < "1.12.0"):
1717
# scipy from Intel channel is 1.10 with python 3.9 and 3.10
1818
pytest.skip("This test file needs scipy>=1.12", allow_module_level=True)
19-
elif scipy.__version__ < "1.14":
19+
elif np.lib.NumpyVersion(scipy.__version__ < "1.14.0"):
2020
# For python-3.11 and 3.12, scipy<1.14 is installed from Intel channel
2121
# For python<=3.9, scipy<1.14 is installed from conda channel
2222
# pylint: disable=no-name-in-module

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ classifiers = [
4949
"Operating System :: POSIX",
5050
"Operating System :: Unix"
5151
]
52-
dependencies = ["numpy>=1.26.4", "mkl-service"]
52+
dependencies = ["numpy>=1.26.4", "mkl-service", "scipy>=1.10.1"]
5353
description = "MKL-based FFT transforms for NumPy arrays"
5454
dynamic = ["version"]
5555
keywords = ["DFTI", "FFT", "Fourier", "MKL"]
@@ -59,7 +59,7 @@ readme = {file = "README.md", content-type = "text/markdown"}
5959
requires-python = ">=3.9,<3.13"
6060

6161
[project.optional-dependencies]
62-
test = ["pytest", "scipy"]
62+
test = ["pytest"]
6363

6464
[project.urls]
6565
Download = "http://github.com/IntelPython/mkl_fft"

0 commit comments

Comments
 (0)