From 9af039259d484ea78f76335b67a457c8485d75d0 Mon Sep 17 00:00:00 2001 From: Christopher Ariza Date: Tue, 19 Dec 2023 07:50:53 -0800 Subject: [PATCH] 0.2.2 RC 2 --- .github/workflows/ci.yml | 118 +++++---------------------------------- 1 file changed, 15 insertions(+), 103 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02c702d..ce1242f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,60 +40,20 @@ jobs: echo 'matrix_os=["macos-13", "ubuntu-22.04", "windows-2022"]' >> $GITHUB_OUTPUT fi - whl_3_8: - name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }} + wheels: + name: Build / ${{ matrix.os }} / Python 3.${{ matrix.python.minor }} needs: matrix_config strategy: fail-fast: false matrix: os: ${{ fromJson(needs.matrix_config.outputs.matrix_os) }} - minor: [8] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@master - - uses: actions/setup-python@master - - run: echo '::add-matcher::.github/problem-matchers/gcc.json' - if: startsWith(matrix.os, 'macos-') || startsWith(matrix.os, 'ubuntu-') - - run: echo '::add-matcher::.github/problem-matchers/msvc.json' - if: startsWith(matrix.os, 'windows-') - - - uses: pypa/cibuildwheel@v2.16.2 - if: matrix.os != 'macos-13-xlarge' - with: - output-dir: dist - env: - CIBW_BUILD: cp3${{ matrix.minor }}-* - CIBW_ARCHS_WINDOWS: x86 AMD64 - CIBW_ARCHS_MACOS: x86_64 - CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_08.txt - CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_08.txt - CIBW_TEST_COMMAND: pytest {project} - - - run: pip install pipx - if: matrix.os == 'macos-13-xlarge' - - uses: pypa/cibuildwheel@v2.16.2 - if: matrix.os == 'macos-13-xlarge' - with: - output-dir: dist - env: - CIBW_BUILD: cp3${{ matrix.minor }}-macosx_arm64 - CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_08.txt - CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_08.txt - CIBW_TEST_COMMAND: pytest {project}/test - - - uses: actions/upload-artifact@v3 - with: - name: dist - path: dist + python: + - {minor: 8, req_build: 'requirements-build-3_08.txt', req_test: 'requirements-dev-3_08.txt'} + - {minor: 9, req_build: 'requirements-build-3_11.txt', req_test: 'requirements-dev-3_11.txt'} + - {minor: 10, req_build: 'requirements-build-3_11.txt', req_test: 'requirements-dev-3_11.txt'} + - {minor: 11, req_build: 'requirements-build-3_11.txt', req_test: 'requirements-dev-3_11.txt'} + - {minor: 12, req_build: 'requirements-build-3_12.txt', req_test: 'requirements-dev-3_12.txt'} - whl_3_9_to_3_11: - name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }} - needs: matrix_config - strategy: - fail-fast: false - matrix: - os: ${{fromJson(needs.matrix_config.outputs.matrix_os)}} - minor: [9, 10, 11] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@master @@ -108,11 +68,11 @@ jobs: with: output-dir: dist env: - CIBW_BUILD: cp3${{ matrix.minor }}-* + CIBW_BUILD: cp3${{ matrix.python.minor }}-* CIBW_ARCHS_WINDOWS: x86 AMD64 CIBW_ARCHS_MACOS: x86_64 - CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_11.txt - CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_11.txt + CIBW_BEFORE_BUILD: pip install -r {project}/${{ matrix.python.req_build }} + CIBW_BEFORE_TEST: pip install -r {project}/${{ matrix.python.req_test }} CIBW_TEST_COMMAND: pytest {project} - run: pip install pipx @@ -122,9 +82,9 @@ jobs: with: output-dir: dist env: - CIBW_BUILD: cp3${{ matrix.minor }}-macosx_arm64 - CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_11.txt - CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_11.txt + CIBW_BUILD: cp3${{ matrix.python.minor }}-macosx_arm64 + CIBW_BEFORE_BUILD: pip install -r {project}/${{ matrix.python.req_build }} + CIBW_BEFORE_TEST: pip install -r {project}/${{ matrix.python.req_test }} CIBW_TEST_COMMAND: pytest {project}/test - uses: actions/upload-artifact@v3 @@ -132,58 +92,10 @@ jobs: name: dist path: dist - whl_3_12: - name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }} - needs: matrix_config - strategy: - fail-fast: false - matrix: - os: ${{fromJson(needs.matrix_config.outputs.matrix_os)}} - minor: [12] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@master - - uses: actions/setup-python@master - - run: echo '::add-matcher::.github/problem-matchers/gcc.json' - if: startsWith(matrix.os, 'macos-') || startsWith(matrix.os, 'ubuntu-') - - run: echo '::add-matcher::.github/problem-matchers/msvc.json' - if: startsWith(matrix.os, 'windows-') - - - run: pip install pipx - if: startsWith(matrix.os, 'macos-') - - - uses: pypa/cibuildwheel@v2.16.2 - if: matrix.os != 'macos-13-xlarge' - with: - output-dir: dist - env: - CIBW_BUILD: cp3${{ matrix.minor }}-* - CIBW_ARCHS_WINDOWS: x86 AMD64 - CIBW_ARCHS_MACOS: x86_64 - CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_12.txt - CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_12.txt - CIBW_TEST_COMMAND: pytest {project} - - uses: actions/upload-artifact@v3 - with: - name: dist - path: dist - - - run: pip install pipx - if: matrix.os == 'macos-13-xlarge' - - uses: pypa/cibuildwheel@v2.16.2 - if: matrix.os == 'macos-13-xlarge' - with: - output-dir: dist - env: - CIBW_BUILD: cp3${{ matrix.minor }}-macosx_arm64 - CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_12.txt - CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_12.txt - CIBW_TEST_COMMAND: pytest {project}/test - upload: name: Publish if: github.event_name == 'release' - needs: [tar_gz, whl_3_8, whl_3_9_to_3_11, whl_3_12] + needs: [tar_gz, wheels] runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3