Skip to content

Commit 8a86e90

Browse files
committed
update GitHub workfkows
1 parent 564ff87 commit 8a86e90

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

.github/workflows/build_pip.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
use-mamba: true
4141
miniforge-version: latest
4242
channels: conda-forge
43+
conda-remove-defaults: true
4344
activate-environment: test
4445
python-version: ${{ matrix.python }}
4546

@@ -52,9 +53,9 @@ jobs:
5253
5354
- name: Build conda package
5455
run: |
55-
pip install --no-cache-dir cython pytest hypothesis
56+
pip install --no-cache-dir cython
5657
pip install --no-cache-dir numpy ${{ matrix.use_pre }}
5758
echo "CONDA_PREFFIX is '${CONDA_PREFIX}'"
5859
export MKLROOT=${CONDA_PREFIX}
59-
pip install -e . --no-build-isolation --verbose --no-deps
60+
pip install -e .[test] --no-build-isolation --verbose
6061
python -m pytest -v mkl_fft/tests

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
1717

1818
jobs:
19-
build:
19+
build_linux:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
@@ -62,8 +62,8 @@ jobs:
6262
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
6363
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
6464

65-
test:
66-
needs: build
65+
test_linux:
66+
needs: build_linux
6767
runs-on: ${{ matrix.runner }}
6868

6969
strategy:
@@ -142,7 +142,7 @@ jobs:
142142
auto-activate-base: true
143143
activate-environment: build
144144
python-version: ${{ matrix.python }}
145-
channels: conda-forge,nodefaults
145+
channels: conda-forge
146146
conda-remove-defaults: 'true'
147147

148148
- name: Install conda-build

.github/workflows/conda-package.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ env:
1616
VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
1717

1818
jobs:
19-
build:
19+
build_linux:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
python: ['3.9', '3.10']
23+
python: ['3.9', '3.10', '3.11', '3.12']
2424
steps:
2525
- uses: actions/checkout@v4
2626
with:
@@ -62,13 +62,13 @@ jobs:
6262
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
6363
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
6464

65-
test:
66-
needs: build
65+
test_linux:
66+
needs: build_linux
6767
runs-on: ${{ matrix.runner }}
6868

6969
strategy:
7070
matrix:
71-
python: ['3.9', '3.10']
71+
python: ['3.9', '3.10', '3.11', '3.12']
7272
experimental: [false]
7373
runner: [ubuntu-latest]
7474
continue-on-error: ${{ matrix.experimental }}
@@ -130,7 +130,7 @@ jobs:
130130

131131
strategy:
132132
matrix:
133-
python: ['3.9', '3.10']
133+
python: ['3.9', '3.10', '3.11', '3.12']
134134
steps:
135135
- uses: actions/checkout@v4.2.0
136136
with:
@@ -184,7 +184,7 @@ jobs:
184184
shell: cmd /C CALL {0}
185185
strategy:
186186
matrix:
187-
python: ['3.9', '3.10']
187+
python: ['3.9', '3.10', '3.11', '3.12']
188188
experimental: [false]
189189
runner: [windows-2019]
190190
continue-on-error: ${{ matrix.experimental }}

0 commit comments

Comments
 (0)