From b6366f41aa8d922276104a147e0dd0e0d7c35257 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Mon, 20 May 2024 16:15:07 +0100 Subject: [PATCH 1/4] attempt to build wheels with mac os latest --- .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 293bad82..cd21ea2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13 ] + os: [ ubuntu-latest, macos-latest ] python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] env: From 17b325171821dacfd88a7c0985c9c45ea211acb1 Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Mon, 20 May 2024 16:49:28 +0100 Subject: [PATCH 2/4] rm openblas --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd21ea2b..6bc31c85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -171,10 +171,6 @@ jobs: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" CIBW_BEFORE_ALL_LINUX: yum install -y openblas-devel - CIBW_BEFORE_ALL_MACOS: > - brew install openblas && - cp -r /usr/local/opt/openblas/lib/* /usr/local/lib && - cp /usr/local/opt/openblas/include/* /usr/local/include CIBW_ENVIRONMENT_MACOS: CFLAGS='-Wno-error=implicit-function-declaration' CIBW_BUILD_VERBOSITY: 3 CIBW_TEST_REQUIRES: pytest From 78dae64f74dfdd1a65d85ce922eeaa1ef02d2a6f Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Mon, 20 May 2024 17:27:28 +0100 Subject: [PATCH 3/4] rm 3.7 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6bc31c85..57d272ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest ] - python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ] + python-version: [ 3.8, 3.9, "3.10", "3.11" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -61,7 +61,7 @@ jobs: # macos-13 runners have intel chips. macos-14 and above # runners have Apple silicon chips. os: [ ubuntu-latest, macos-13, 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"] link_mkl: [true, false] env: @@ -89,7 +89,7 @@ jobs: else BLAS_PKGS="blas-devel=*=*openblas" fi - if [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]] || [[ "$PYTHON_VERSION" == "3.9" ]]; then + if [[ "$PYTHON_VERSION" == "3.8" ]] || [[ "$PYTHON_VERSION" == "3.9" ]]; then conda install scipy=1.5 numpy=1.19 pytest $BLAS_PKGS pkg-config elif [[ "$PYTHON_VERSION" == "3.10" ]]; then conda install scipy=1.7 numpy=1.21 pytest $BLAS_PKGS pkg-config @@ -100,13 +100,13 @@ jobs: fi - name: Build run: | - if [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then + if [[ "$PYTHON_VERSION" == "3.8" ]]; then if [[ "$LINK_MKL" == "true" ]]; then python legacy_setup.py install --scs --mkl else python legacy_setup.py install fi - elif [[ "$PYTHON_VERSION" != "3.7" ]] && [[ "$PYTHON_VERSION" != "3.8" ]]; then + elif [[ "$PYTHON_VERSION" != "3.8" ]]; then python -c "import numpy as np; print('NUMPY BLAS INFOS'); print(np.show_config())" if [[ "$LINK_MKL" == "true" ]]; then python -m pip install --verbose -Csetup-args=-Dlink_mkl=true . @@ -144,7 +144,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-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: RUNNER_OS: ${{ matrix.os }} From 7e04fc6c1bd1ba6c03cad33caa449554b37289ad Mon Sep 17 00:00:00 2001 From: Brendan O'Donoghue Date: Tue, 21 May 2024 11:13:35 +0100 Subject: [PATCH 4/4] add mac os 13 back in --- .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 57d272ab..219ebc31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ ubuntu-latest, macos-13, macos-latest ] python-version: [ 3.8, 3.9, "3.10", "3.11", "3.12"] env: