Skip to content

Commit 1fbc656

Browse files
committed
add new scipy tests
1 parent 004ad93 commit 1fbc656

File tree

9 files changed

+771
-11
lines changed

9 files changed

+771
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
- name: Install mkl_fft
118118
run: |
119119
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
120-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} $PACKAGE_NAME pytest $CHANNELS
120+
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} $PACKAGE_NAME pytest scipy $CHANNELS
121121
# Test installed packages
122122
conda list -n ${{ env.TEST_ENV_NAME }}
123123
- name: Run tests
@@ -268,7 +268,7 @@ jobs:
268268
SET PACKAGE_VERSION=%%F
269269
)
270270
SET "TEST_DEPENDENCIES=pytest pytest-cov"
271-
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 }}
271+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
272272
- name: Report content of test environment
273273
shell: cmd /C CALL {0}
274274
run: |

.github/workflows/conda-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
- name: Install mkl_fft
117117
run: |
118118
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
119-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} $PACKAGE_NAME pytest $CHANNELS
119+
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python }} $PACKAGE_NAME pytest scipy $CHANNELS
120120
# Test installed packages
121121
conda list -n ${{ env.TEST_ENV_NAME }}
122122
- name: Run tests
@@ -267,7 +267,7 @@ jobs:
267267
SET PACKAGE_VERSION=%%F
268268
)
269269
SET "TEST_DEPENDENCIES=pytest pytest-cov"
270-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
270+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
271271
- name: Report content of test environment
272272
shell: cmd /C CALL {0}
273273
run: |

.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
_vendored/__pycache__/
1+
# CMake build and local install directory
22
build/
33
mkl_fft.egg-info/
4-
mkl_fft/__pycache__/
4+
5+
# Byte-compiled / optimized / DLL files
6+
__pycache__/
7+
58
mkl_fft/_pydfti.c
6-
mkl_fft/_pydfti.cpython-310-x86_64-linux-gnu.so
7-
mkl_fft/interfaces/__pycache__/
9+
mkl_fft/_pydfti.cpython*.so
810
mkl_fft/src/mklfft.c
9-
mkl_fft/tests/__pycache__/

conda-recipe-cf/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test:
3232
- pytest -v --pyargs mkl_fft
3333
requires:
3434
- pytest
35+
- scipy
3536
imports:
3637
- mkl_fft
3738
- mkl_fft.interfaces

conda-recipe/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test:
3232
- pytest -v --pyargs mkl_fft
3333
requires:
3434
- pytest
35+
- scipy
3536
imports:
3637
- mkl_fft
3738
- mkl_fft.interfaces

0 commit comments

Comments
 (0)