From 96080266335dd14709da3bc2d521962101c66482 Mon Sep 17 00:00:00 2001 From: Michael O'Keefe Date: Mon, 18 Nov 2024 10:46:56 -0700 Subject: [PATCH] Iterating on build settings for cibuildwheel --- .github/workflows/build_and_test.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 1fbf953b..be9d175c 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -27,11 +27,8 @@ jobs: - name: set up rust uses: dtolnay/rust-toolchain@stable - run: | - if [[ $(sysctl -n machdep.cpu.brand_string) =~ "Apple" ]]; then - rustup target add aarch64-apple-darwin; - else - rustup target add x86_64-apple-darwin; - fi + rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin if: matrix.os == 'macos' shell: bash - name: set up python @@ -57,7 +54,7 @@ jobs: CIBW_BUILD: "cp3${{ matrix.python-version }}-*" CIBW_SKIP: "*-win32 *-musllinux* *i686 *ppc64le *s390x *aarch64" CIBW_PLATFORM: ${{ matrix.platform || matrix.os }} - # CIBW_TEST_REQUIRES: pytest + # TODO: why doesn't pytest work with cibuildwheel? # CIBW_TEST_COMMAND: "pytest -v {project}/python/fastsim/tests" CIBW_TEST_COMMAND: "python -m unittest discover {project}/python/fastsim/tests" CIBW_ARCHS_MACOS: "universal2" @@ -68,12 +65,12 @@ jobs: CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014" CIBW_MANYLINUX_I686_IMAGE: "manylinux2014" CIBW_BEFORE_BUILD: > - python -m pip install -U setuptools-rust pytest && + python -m pip install -U setuptools-rust && rustup default stable && rustup show CIBW_BEFORE_BUILD_LINUX: > yum -y install openssl openssl-devel && - pip install -U setuptools-rust pytest && + pip install -U setuptools-rust && curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y && rustup show - name: list dist files