From 41754e960163970dd1df6868e06535eaa253ec11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 02:52:45 +0000 Subject: [PATCH 1/4] Bump pypa/cibuildwheel from 2.18 to 2.19 in the actions group Bumps the actions group with 1 update: [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel). Updates `pypa/cibuildwheel` from 2.18 to 2.19 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.18...v2.19) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2235cb383..2e18d6774 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -66,7 +66,7 @@ jobs: echo "REPAIR_LIBRARY_PATH=$CONDA_PREFIX/lib" >> $GITHUB_ENV # https://github.com/pypa/cibuildwheel/issues/816#issuecomment-916197079 echo "$CONDA_PREFIX/bin" >> $GITHUB_PATH # necessary when we don't activate the environment - name: Build wheels - uses: pypa/cibuildwheel@v2.18 + uses: pypa/cibuildwheel@v2.19 env: CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}_${{ matrix.buildplat[2] }} CIBW_BUILD_VERBOSITY: 1 From 4bf126528a21af28a8c2a6d90e222e47fb795110 Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Mon, 17 Jun 2024 14:56:07 -0400 Subject: [PATCH 2/4] Set MACOSX_DEPLOYMENT_TARGET=10.13 in wheels --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2e18d6774..1f749cac5 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -73,6 +73,7 @@ jobs: CIBW_BEFORE_BUILD_LINUX: yum -y install gsl-devel CIBW_ARCHS_MACOS: ${{ matrix.buildplat[2] }} CIBW_CONFIG_SETTINGS_MACOS: "--build-option=--no-openmp" + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.13" CIBW_REPAIR_WHEEL_COMMAND_MACOS: > DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel -v --require-archs {delocate_archs} -w {dest_dir} {wheel} From a9744eed53c6528ab75a0bab3ccae497249c55b2 Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Mon, 17 Jun 2024 15:11:59 -0400 Subject: [PATCH 3/4] Drop --no-openmp when generating wheels --- .github/workflows/wheels.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1f749cac5..39582565e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -72,7 +72,6 @@ jobs: CIBW_BUILD_VERBOSITY: 1 CIBW_BEFORE_BUILD_LINUX: yum -y install gsl-devel CIBW_ARCHS_MACOS: ${{ matrix.buildplat[2] }} - CIBW_CONFIG_SETTINGS_MACOS: "--build-option=--no-openmp" CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.13" CIBW_REPAIR_WHEEL_COMMAND_MACOS: > DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && From 91252ffb4c97b26298c10ea17c461b2a6327912f Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 18 Jun 2024 10:00:55 -0400 Subject: [PATCH 4/4] Run a brief test of the generated wheels --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 39582565e..5ef855998 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -76,6 +76,8 @@ jobs: CIBW_REPAIR_WHEEL_COMMAND_MACOS: > DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel -v --require-archs {delocate_archs} -w {dest_dir} {wheel} + CIBW_BEFORE_TEST: pip install pytest astropy + CIBW_TEST_COMMAND: pytest -v {package}/tests/test_orbit.py -k "test_energy_jacobi_conservation and NFW" - uses: actions/upload-artifact@v4 with: name: ${{ matrix.python }}-${{ matrix.buildplat[1] }}_${{ matrix.buildplat[2] }}