diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 416dd5d..3dbe293 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-10.15 ] # windows-latest not finding MKL - python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ] + python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest ] - python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ] + python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -99,7 +99,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-10.15, windows-latest ] - python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ] + python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -125,6 +125,8 @@ jobs: conda install scipy=1.7 numpy=1.21 pytest mkl openblas lapack elif [[ "$PYTHON_VERSION" == "3.11" ]]; then conda install scipy=1.9.3 numpy=1.23.4 pytest mkl openblas lapack + elif [[ "$PYTHON_VERSION" == "3.12" ]]; then + conda install scipy numpy pytest mkl openblas lapack fi - name: Test run: | @@ -155,7 +157,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, macos-10.15 ] - python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ] + python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12" ] env: RUNNER_OS: ${{ matrix.os }} diff --git a/pyproject.toml b/pyproject.toml index 8efd161..3a567e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools<65.6.0", + "setuptools", "wheel", "oldest-supported-numpy", ] diff --git a/scs b/scs index fa32d87..f5f054b 160000 --- a/scs +++ b/scs @@ -1 +1 @@ -Subproject commit fa32d873d1812d6b80597a417d8e61a3a224ad50 +Subproject commit f5f054be7dd71ee0d80c4c0eec0df1e9f0ccb123