From c9e5005a8f7f0c28d74ce43b22641c094f91bd64 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 15 Oct 2024 09:55:58 +0100 Subject: [PATCH 1/9] Support Python 3.13 --- .github/workflows/build.yml | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34b32caa..b5d07dfe 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.8, 3.9, "3.10", "3.11" ] + python-version: [ 3.9, "3.10", "3.11", "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.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13"] link_mkl: [true, false] env: @@ -91,32 +91,22 @@ jobs: else BLAS_PKGS="blas-devel=*=*openblas" fi - if [[ "$PYTHON_VERSION" == "3.8" ]]; then - conda install scipy=1.5 numpy=1.19 pytest $BLAS_PKGS pkg-config 'setuptools<=60' - elif [[ "$PYTHON_VERSION" == "3.9" ]]; then + if [[ "$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 elif [[ "$PYTHON_VERSION" == "3.11" ]]; then conda install scipy=1.9.3 numpy=1.23.4 pytest $BLAS_PKGS pkg-config - elif [[ "$PYTHON_VERSION" == "3.12" ]]; then + elif [[ "$PYTHON_VERSION" == "3.12" || "$PYTHON_VERSION" == "3.13" ]]; then conda install scipy numpy pytest $BLAS_PKGS pkg-config fi - name: Build run: | - 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.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 . - else - python -m pip install --verbose . - fi + 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 . + else + python -m pip install --verbose . fi - name: Test run: | @@ -148,7 +138,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-13, macos-latest ] - python-version: [ 3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13"] env: RUNNER_OS: ${{ matrix.os }} @@ -166,7 +156,7 @@ jobs: shell: bash run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV - echo "SINGLE_ACTION_CONFIG=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + echo "SINGLE_ACTION_CONFIG=False" >> $GITHUB_ENV echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels @@ -218,7 +208,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 - name: Set Additional Envs shell: bash run: | From 67120bbe6d2038df0306764a0a18f85dab8ba8e4 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 15 Oct 2024 09:59:27 +0100 Subject: [PATCH 2/9] Fix versions --- .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 b5d07dfe..c4cf08e9 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.9, "3.10", "3.11", "3.11" ] + python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13" ] env: PYTHON_VERSION: ${{ matrix.python-version }} From e2c6e05ebafa03526a40b06295baa7315891f922 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 15 Oct 2024 10:04:27 +0100 Subject: [PATCH 3/9] Increase min version --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8c17f2d0..78e21e90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] build-backend = 'mesonpy' requires = [ - "numpy >= 2.0.0; python_version > '3.8'", - "oldest-supported-numpy; python_version <= '3.8'", + "numpy >= 2.0.0; python_version > '3.9'", + "oldest-supported-numpy; python_version <= '3.9'", "meson-python" ] From 6cb78c1163268f152c4d702c12edd91d5424f246 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 15 Oct 2024 10:05:49 +0100 Subject: [PATCH 4/9] Don't build openmp on newer python --- .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 c4cf08e9..c960d699 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.9, "3.10", "3.11", "3.12", "3.13" ] + python-version: [ 3.9, "3.10", "3.11" ] env: PYTHON_VERSION: ${{ matrix.python-version }} From d4f99f9bc4d2b6395d81a66a8cd298fd188a6da4 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Mon, 21 Oct 2024 12:06:49 +0100 Subject: [PATCH 5/9] Revert meson build change --- .github/workflows/build.yml | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c960d699..35186105 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.9, "3.10", "3.11" ] + python-version: [ 3.9, "3.10", "3.11", "3.12", ] env: PYTHON_VERSION: ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index 78e21e90..8c17f2d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] build-backend = 'mesonpy' requires = [ - "numpy >= 2.0.0; python_version > '3.9'", - "oldest-supported-numpy; python_version <= '3.9'", + "numpy >= 2.0.0; python_version > '3.8'", + "oldest-supported-numpy; python_version <= '3.8'", "meson-python" ] From 11834819e5f2c2247bb402590c4626125ae673a8 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 12 Nov 2024 16:00:03 +0000 Subject: [PATCH 6/9] Don't pin setuptools --- .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 35186105..3893029c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: channels: conda-forge,anaconda - name: Install dependencies run: | - conda install scipy numpy pytest 'setuptools<=60' + conda install scipy numpy pytest setuptools - name: Test run: | python legacy_setup.py install --scs --openmp From 0a7ebd97d8d05bdab285780a964021c63daa8604 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 12 Nov 2024 16:22:25 +0000 Subject: [PATCH 7/9] Don't test legacy setup on >3.11 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3893029c..d7a8ec1b 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.9, "3.10", "3.11", "3.12", ] + python-version: [ 3.9, "3.10", "3.11" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -43,7 +43,7 @@ jobs: channels: conda-forge,anaconda - name: Install dependencies run: | - conda install scipy numpy pytest setuptools + conda install scipy numpy pytest setuptools<=60' - name: Test run: | python legacy_setup.py install --scs --openmp From 727d1742e720fcfb95711fc4f13e72dbdb9c72d0 Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Tue, 12 Nov 2024 16:29:47 +0000 Subject: [PATCH 8/9] Add missing apostrophe --- .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 d7a8ec1b..c960d699 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: channels: conda-forge,anaconda - name: Install dependencies run: | - conda install scipy numpy pytest setuptools<=60' + conda install scipy numpy pytest 'setuptools<=60' - name: Test run: | python legacy_setup.py install --scs --openmp From 3bc0b242241921ad85ff3d2f52ca3db2f202ca6b Mon Sep 17 00:00:00 2001 From: Jon Daly Date: Mon, 18 Nov 2024 09:44:19 +0000 Subject: [PATCH 9/9] Remove static flag --- .github/workflows/build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c960d699..5aa43c59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,7 +156,6 @@ jobs: shell: bash run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV - echo "SINGLE_ACTION_CONFIG=False" >> $GITHUB_ENV echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels @@ -171,12 +170,6 @@ jobs: CIBW_TEST_COMMAND: pytest {package} uses: joerick/cibuildwheel@v2.21.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 uses: actions/upload-artifact@v4 with: