From 8a86e90120a9cb4592145ed8b0ff73bdf103733b Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Tue, 8 Apr 2025 22:10:58 -0700 Subject: [PATCH 1/3] update GitHub workfkows --- .github/workflows/build_pip.yaml | 5 +++-- .github/workflows/conda-package-cf.yml | 8 ++++---- .github/workflows/conda-package.yml | 14 +++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_pip.yaml b/.github/workflows/build_pip.yaml index d9c11e9..5547257 100644 --- a/.github/workflows/build_pip.yaml +++ b/.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 }} @@ -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 diff --git a/.github/workflows/conda-package-cf.yml b/.github/workflows/conda-package-cf.yml index e87c62f..5233f01 100644 --- a/.github/workflows/conda-package-cf.yml +++ b/.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: @@ -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 diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index d01f2de..3325b9f 100644 --- a/.github/workflows/conda-package.yml +++ b/.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 }} From 32e7a534335fe296f6e105077f715de0b7a24b5d Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad <120411540+vtavana@users.noreply.github.com> Date: Wed, 9 Apr 2025 08:01:35 -0500 Subject: [PATCH 2/3] Update .github/workflows/build_pip.yaml Co-authored-by: Anton <100830759+antonwolfy@users.noreply.github.com> --- .github/workflows/build_pip.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pip.yaml b/.github/workflows/build_pip.yaml index 5547257..f90f50d 100644 --- a/.github/workflows/build_pip.yaml +++ b/.github/workflows/build_pip.yaml @@ -58,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 From 27824c438559b262cd87ea51aa84f1e0e7b5061e Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Wed, 9 Apr 2025 06:03:15 -0700 Subject: [PATCH 3/3] remove auto-activate-base: true --- .github/workflows/conda-package-cf.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conda-package-cf.yml b/.github/workflows/conda-package-cf.yml index 5233f01..d5cffb8 100644 --- a/.github/workflows/conda-package-cf.yml +++ b/.github/workflows/conda-package-cf.yml @@ -139,7 +139,6 @@ 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