From 0f93284fdf84dc418edc47fbc805c8919a3f1822 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Wed, 8 Nov 2023 12:11:40 +0000 Subject: [PATCH 1/6] rm py 3.7 from actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 883255d..d8e5c14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,7 +90,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [ 3.8, 3.9, "3.10", "3.11", "3.12"] env: PYTHON_VERSION: ${{ matrix.python-version }} From 32f3111cdf8207348fa6573e52fc6655b6b74e58 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Wed, 8 Nov 2023 12:31:31 +0000 Subject: [PATCH 2/6] run more actions --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8e5c14..31d1b45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,7 +132,7 @@ jobs: pytest rm -rf build/ - name: Build and test windows wheels - if: ${{env.DEPLOY == 'True' && startsWith(matrix.os, 'windows')}} + if: ${{startsWith(matrix.os, 'windows')}} run: | python -m pip install build python -m build -Csetup-args="-Dlink_blas_statically=True" @@ -179,7 +179,6 @@ jobs: echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels - if: ${{env.DEPLOY == 'True'}} env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" @@ -196,7 +195,6 @@ jobs: uses: joerick/cibuildwheel@v2.11.3 - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python -m pip install build python -m build -Csetup-args="-Dlink_blas_statically=True" --outdir=wheelhouse From dcba330d4793bb5dbf0c02d3b94243342429c37e Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Wed, 8 Nov 2023 12:35:33 +0000 Subject: [PATCH 3/6] Revert "rm py 3.7 from actions" This reverts commit 0f93284fdf84dc418edc47fbc805c8919a3f1822. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31d1b45..7ac9d70 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,7 +90,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - python-version: [ 3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] env: PYTHON_VERSION: ${{ matrix.python-version }} From e9f93ca71681e0164a08494c675f4192201ac2c5 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Wed, 8 Nov 2023 12:43:49 +0000 Subject: [PATCH 4/6] restor single action config --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ac9d70..5ab2f62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -200,7 +200,7 @@ jobs: python -m build -Csetup-args="-Dlink_blas_statically=True" --outdir=wheelhouse - name: Upload artifacts to github - if: ${{env.DEPLOY == 'True'}} + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} uses: actions/upload-artifact@v1 with: name: wheels From 567166aa777345d38ee3e5b84f5d823d0362bc6f Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Wed, 8 Nov 2023 12:45:05 +0000 Subject: [PATCH 5/6] require python >= 3.7 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9431baa..7b351d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,11 +7,11 @@ name = 'scs' version = "3.2.4" description = 'Splitting conic solver' readme = 'README.md' -requires-python = '>=3.8' +requires-python = '>=3.7' license = {file = 'LICENSE'} authors = [ {name = "Brendan O'Donoghue", email = "bodonoghue85@gmail.com"}] dependencies = [ 'numpy', 'scipy', -] \ No newline at end of file +] From 7bf1c8c8c16a3a04af8a7496ca57d768eddb287d Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Wed, 8 Nov 2023 13:26:38 +0000 Subject: [PATCH 6/6] update cibuildwheel --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ab2f62..ffbac11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -192,15 +192,16 @@ jobs: CIBW_BUILD_VERBOSITY: 3 CIBW_TEST_REQUIRES: pytest CIBW_TEST_COMMAND: pytest {package} - uses: joerick/cibuildwheel@v2.11.3 + uses: joerick/cibuildwheel@v2.16.2 - name: Build source + if: ${{env.SINGLE_ACTION_CONFIG == 'True'}} run: | python -m pip install build python -m build -Csetup-args="-Dlink_blas_statically=True" --outdir=wheelhouse - name: Upload artifacts to github - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{env.DEPLOY == 'True'}} uses: actions/upload-artifact@v1 with: name: wheels