From c20ebaeef2b924c5f324bb2d4eab6cbdedd5570d Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Wed, 1 May 2024 13:09:52 -0400 Subject: [PATCH] set `FFTW_DIR` to library directory installed by `brew` --- .github/workflows/ci.yml | 7 ++++--- .github/workflows/ci_cron.yml | 7 ++++--- tox.ini | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 918589fc..4ba2116a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,14 +65,15 @@ jobs: uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main needs: [ data ] with: + libraries: | + brew: + - fftw setenv: | WEBBPSF_PATH: ${{ needs.data.outputs.webbpsf_path }} GALSIM_CAT_PATH: ${{ needs.data.outputs.galsim_cat_path }} + FFTW_DIR: /usr/local/lib/ cache-path: ${{ needs.data.outputs.path }} cache-key: data-${{ needs.data.outputs.hash }} - libraries: | - brew: - - fftw envs: | - linux: py310-oldestdeps-cov-xdist - linux: py310-xdist diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml index 55cb2ff3..032234cd 100644 --- a/.github/workflows/ci_cron.yml +++ b/.github/workflows/ci_cron.yml @@ -54,14 +54,15 @@ jobs: uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main needs: [ data ] with: + libraries: | + brew: + - fftw setenv: | WEBBPSF_PATH: ${{ needs.data.outputs.webbpsf_path }} GALSIM_CAT_PATH: ${{ needs.data.outputs.galsim_cat_path }} + FFTW_DIR: /usr/local/lib/ cache-path: ${{ needs.data.outputs.path }} cache-key: data-${{ needs.data.outputs.hash }} - libraries: | - brew: - - fftw envs: | - macos: py310-xdist - macos: py311-xdist diff --git a/tox.ini b/tox.ini index 5402bc03..24a8c13d 100644 --- a/tox.ini +++ b/tox.ini @@ -48,6 +48,8 @@ pass_env = CODECOV_* WEBBPSF_PATH GALSIM_CAT_PATH + FFTW_DIR + LIBRARY_PATH extras = test deps =