diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index bd61194e0..3a9ad383e 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -2,15 +2,6 @@ name: build-and-test run-name: ${{ github.actor }} is building "${{ github.ref_name }}" on: [push] -env: - CIBW_ARCHS_LINUX: auto - CIBW_ARCHS_MACOS: x86_64 universal2 - CIBW_SKIP: pp* cp27-* *_i686 *-win32 *musllinux* - # Fails currently - CIBW_TEST_COMMAND: # python ${{ github.workspace }}/nl-writer2/nlwpy/tests/test.py - CIBW_TEST_REQUIRES: # scipy numpy -# CIBW_TEST_REQUIRES: --index-url https://pypi.ampl.com --extra-index-url https://pypi.org/simple ampl_module_base ampl_module_highs pandas numpy - jobs: build_native: name: Build wheels on ${{ matrix.os }} @@ -26,12 +17,6 @@ jobs: uses: pypa/cibuildwheel@v2.16.5 with: package-dir: nl-writer2/ - env: - CIBW_ARCHS_LINUX: ${{ env.CIBW_ARCHS_LINUX }} - CIBW_ARCHS_MACOS: ${{ env.CIBW_ARCHS_MACOS }} - CIBW_SKIP: ${{ env.CIBW_SKIP }} - CIBW_TEST_COMMAND: ${{ env.CIBW_TEST_COMMAND }} - CIBW_TEST_REQUIRES: ${{ env.CIBW_TEST_REQUIRES }} - uses: actions/upload-artifact@v3 with: @@ -43,7 +28,7 @@ jobs: #needs: build_native strategy: matrix: - arch: [aarch64, ppc64le] + arch: [aarch64] build: [cp37-*, cp38-*, cp39-*, cp310-*, cp311-*, cp312-*] runs-on: ubuntu-20.04 steps: @@ -60,11 +45,7 @@ jobs: package-dir: nl-writer2/ env: CIBW_ARCHS_LINUX: ${{ matrix.arch }} - CIBW_ARCHS_MACOS: ${{ env.CIBW_ARCHS_MACOS }} CIBW_BUILD: ${{ matrix.build }} - CIBW_SKIP: ${{ env.CIBW_SKIP }} - CIBW_TEST_COMMAND: ${{ env.CIBW_TEST_COMMAND }} - CIBW_TEST_REQUIRES: ${{ env.CIBW_TEST_REQUIRES }} - uses: actions/upload-artifact@v3 with: diff --git a/nl-writer2/pyproject.toml b/nl-writer2/pyproject.toml index d71a03760..40729863d 100644 --- a/nl-writer2/pyproject.toml +++ b/nl-writer2/pyproject.toml @@ -7,6 +7,7 @@ build-backend = "setuptools.build_meta" [tool.cibuildwheel] skip = ["pp*", "cp27-*", "*_i686", "*-win32", "*musllinux*"] +archs = ["auto"] test-requires = [ "--index-url https://pypi.ampl.com", "--extra-index-url https://pypi.org/simple",