Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 3 additions & 2 deletions .github/workflows/build_pip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -52,9 +53,9 @@ jobs:

- name: Build conda package
run: |
pip install --no-cache-dir cython pytest hypothesis
pip install --no-cache-dir cython
pip install --no-cache-dir numpy ${{ matrix.use_pre }}
echo "CONDA_PREFFIX is '${CONDA_PREFIX}'"
export MKLROOT=${CONDA_PREFIX}
pip install -e . --no-build-isolation --verbose --no-deps
pip install -e .[test] --no-build-isolation --verbose
python -m pytest -v mkl_fft/tests
8 changes: 4 additions & 4 deletions .github/workflows/conda-package-cf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
Loading