diff --git a/.github/workflows/build_default.yml b/.github/workflows/build_default.yml index da05f546..af61259b 100644 --- a/.github/workflows/build_default.yml +++ b/.github/workflows/build_default.yml @@ -56,7 +56,7 @@ jobs: - uses: actions/checkout@master - name: Build wheels - uses: pypa/cibuildwheel@v2.23 + uses: pypa/cibuildwheel@v3.3.1 with: config-file: cibuildwheel.toml output-dir: wheelhouse diff --git a/.github/workflows/build_mkl.yml b/.github/workflows/build_mkl.yml index 1457633a..496b7465 100644 --- a/.github/workflows/build_mkl.yml +++ b/.github/workflows/build_mkl.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@master - name: Build wheels - uses: pypa/cibuildwheel@v2.23 + uses: pypa/cibuildwheel@v3.3.1 with: package-dir: backend/mkl config-file: backend/mkl/cibuildwheel.toml diff --git a/.github/workflows/build_mkl_windows.yml b/.github/workflows/build_mkl_windows.yml index c4c6af4c..f4bbe82f 100644 --- a/.github/workflows/build_mkl_windows.yml +++ b/.github/workflows/build_mkl_windows.yml @@ -49,7 +49,7 @@ jobs: rd /s/q "webimage_base_extracted" - name: Build wheels - uses: pypa/cibuildwheel@v2.23 + uses: pypa/cibuildwheel@v3.3.1 with: package-dir: backend/mkl config-file: backend/mkl/cibuildwheel.toml diff --git a/.github/workflows/build_wasm.yml b/.github/workflows/build_wasm.yml index c1caab96..7f516ff8 100644 --- a/.github/workflows/build_wasm.yml +++ b/.github/workflows/build_wasm.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@master - name: Build wheels - uses: pypa/cibuildwheel@v2.23 + uses: pypa/cibuildwheel@v3.3.1 env: CIBW_PLATFORM: pyodide with: diff --git a/README.md b/README.md index d7284cfb..fd18ac6e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![PyPI version](https://badge.fury.io/py/osqp.svg)](https://badge.fury.io/py/osqp) -[![Python 3.8‒3.13](https://img.shields.io/badge/python-3.8%E2%80%923.13-blue)](https://www.python.org) +[![Python 3.8‒3.14](https://img.shields.io/badge/python-3.8%E2%80%923.14-blue)](https://www.python.org) [![Build](https://github.com/osqp/osqp-python/actions/workflows/build_default.yml/badge.svg)](https://github.com/osqp/osqp-python/actions/workflows/build_default.yml) # OSQP Python diff --git a/backend/cuda/cibuildwheel.toml b/backend/cuda/cibuildwheel.toml index 6f670d40..f8b0b453 100644 --- a/backend/cuda/cibuildwheel.toml +++ b/backend/cuda/cibuildwheel.toml @@ -1,6 +1,6 @@ [tool.cibuildwheel] build = "cp3*" -skip = ["cp36-*", "cp37-*", "*-win32", "*-manylinux_i686", "*-musllinux_*"] +skip = ["cp313t-*", "cp314t-*", "*-win32", "*-manylinux_i686", "*-musllinux_*"] build-verbosity = 1 before-build = "rm -rf {package}/osqp_sources/build" repair-wheel-command = "" diff --git a/backend/mkl/cibuildwheel.toml b/backend/mkl/cibuildwheel.toml index a257b34f..c70c14cb 100644 --- a/backend/mkl/cibuildwheel.toml +++ b/backend/mkl/cibuildwheel.toml @@ -1,14 +1,14 @@ [tool.cibuildwheel] build = "cp3*" -skip = ["cp36-*", "cp37-*", "*-win32", "*-manylinux_i686", "*-musllinux_*"] +skip = ["cp313t-*", "cp314t-*", "*-win32", "*-manylinux_i686", "*-musllinux_*"] build-verbosity = 1 before-build = "rm -rf {package}/osqp_sources/build" [tool.cibuildwheel.linux] before-all = [ - "yum-config-manager --add-repo https://yum.repos.intel.com/oneapi", + "dnf config-manager --add-repo https://yum.repos.intel.com/oneapi", "rpm --import https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB", - "yum --nogpgcheck install -y intel-oneapi-mkl-devel-2023.0.0" + "dnf --nogpgcheck install -y intel-oneapi-mkl-devel-2023.0.0" ] environment = { MKL_ROOT = "/opt/intel/oneapi/mkl/latest" } repair-wheel-command = "" diff --git a/cibuildwheel.toml b/cibuildwheel.toml index a9082b9d..3661c8bf 100644 --- a/cibuildwheel.toml +++ b/cibuildwheel.toml @@ -1,6 +1,6 @@ [tool.cibuildwheel] build = "cp3*" -skip = ["cp36-*", "cp37-*", "*-win32", "*-manylinux_i686", "*-musllinux_*"] +skip = ["cp313t-*", "cp314t-*", "*-win32", "*-manylinux_i686", "*-musllinux_*"] build-verbosity = 1 before-build = "rm -rf {package}/osqp_sources/build" # Install CPU-only version of torch beforehand since that allows cibuildwheel @@ -13,7 +13,7 @@ test-command = "python -m pytest -s {project}/src/osqp/tests" [[tool.cibuildwheel.overrides]] # Platforms on which installing pytorch is problematic, so we skip testing # the `osqp.nn` module -select = "*manylinux_aarch64 cp313-macosx_x86_64" +select = "*manylinux_aarch64 cp313-macosx_x86_64 cp314-macosx_x86_64" before-test = 'pip install scipy --prefer-binary' test-groups = ["test-no-nn"] test-command = "python -m pytest -s {project}/src/osqp/tests --continue-on-collection-errors --ignore={project}/src/osqp/tests/nn_test.py" diff --git a/pyproject.toml b/pyproject.toml index c52e0fc7..29fae926 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,8 @@ build-backend = "scikit_build_core.build" name = "osqp" dynamic = ["version"] description = "OSQP: The Operator Splitting QP Solver" +license = "Apache-2.0" +license-files = ["LICENSE"] readme = "README.md" requires-python = ">=3.8" authors = [