complete merge

Author: Transurgeon

.github/workflows/build.yml

@@ -28,16 +28,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-13, windows-2022 ]
-        python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13" ]
+        os: [ ubuntu-22.04, macos-14, windows-2022 ]
+        python-version: [ "3.11", "3.12", "3.13" ]
         include:
           # These are intended to just add their extra parameter to existing matrix combinations;
           # see https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixinclude
           - os: ubuntu-22.04
             python-version: 3.12
             openmp: "True"
             single_action_config: false
-          - os: macos-13
+          - os: macos-14
             python-version: 3.12
             single_action_config: true
 
@@ -49,17 +49,18 @@ jobs:
       MOSEK_CI_BASE64: ${{ secrets.MOSEK_CI_BASE64 }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set Additional Envs
         run: |
           echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV
           echo $MOSEK_CI_BASE64 | base64 -d > mosek.lic
           echo "MOSEKLM_LICENSE_FILE=$( [[ $RUNNER_OS == 'macOS' ]] && echo $(pwd)/mosek.lic || echo $(realpath mosek.lic) )" >> $GITHUB_ENV
-      - uses: conda-incubator/setup-miniconda@v3
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          channels: conda-forge,anaconda
+          enable-cache: true
 
       - name: Install
         run: |
@@ -83,8 +84,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-13, windows-2022 ]
-        python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13" ]
+        os: [ ubuntu-22.04, macos-14, windows-2022 ]
+        python-version: [ "3.11", "3.12", "3.13" ]
         build-cvxpy-base: [ true, false ]  # whether to build cvxpy-base (true) or regular cvxpy (false)
         include:
           # This is intended to just add the single_action_config parameter to one existing combination;
@@ -104,8 +105,8 @@ jobs:
       CVXPY_BASE_SUFFIX: ${{ matrix.build-cvxpy-base && 'base-' || '' }}
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -149,7 +150,7 @@ jobs:
           CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"
           CIBW_ARCHS_MACOS: x86_64 universal2
           CIBW_ARCHS_LINUX: auto aarch64
-        uses: pypa/cibuildwheel@v3.0.0
+        uses: pypa/cibuildwheel@v3.1.4
 
       - name: Build source
         if: ${{github.event_name == 'push' && env.SINGLE_ACTION_CONFIG == 'True'}}
@@ -161,7 +162,7 @@ jobs:
         if: ${{github.event_name == 'push' && env.USE_OPENMP != 'True'}}
         shell: bash
         run: |
-          python -m pip install --upgrade twine
+          pip install --upgrade twine
           twine check wheelhouse/*
 
       - name: Release to pypi

.github/workflows/cvxpygen.yml

@@ -11,10 +11,10 @@ jobs:
   test_backends:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install pytest and cvxpygen
         run: |
           pip install . pytest hypothesis

.github/workflows/docs.yml

@@ -7,10 +7,10 @@ jobs:
   doc_deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: gh-pages
       - name: Set already deployed versions
@@ -20,7 +20,7 @@ jobs:
           echo ALL_DEPLOYED_VERSIONS=$(python -c "import os;from packaging import version;print(os.listdir('version'))") >> $GITHUB_ENV
 
         # Checkout master
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install
         run: |
           python -m pip install -e .

.github/workflows/pre-commit.yml

@@ -13,7 +13,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1
 

.github/workflows/scorecards.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.2
         with:
           persist-credentials: false
 
@@ -51,6 +51,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v2.16.4
+        uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v2.16.4
         with:
           sarif_file: results.sarif

.github/workflows/test_backends.yml

@@ -12,10 +12,10 @@ jobs:
   test_backends:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install cvxpy dependencies
         run: |
           pip install .

.github/workflows/test_optional_solvers.yml

@@ -1,12 +1,13 @@
 name: test_optional_solvers
 
 on:
-    pull_request:
-    push:
-        branches:
-            - master
-        tags:
-          - '*'
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+
 jobs:
   test_optional_solvers:
     runs-on: ${{ matrix.os }}
@@ -16,34 +17,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-13, windows-2022 ]
+        os: [ ubuntu-22.04, macos-14, windows-2022 ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set Additional Envs
         run: |
           echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV
           echo $MOSEK_CI_BASE64 | base64 -d > mosek.lic
           echo "MOSEKLM_LICENSE_FILE=$( [[ $RUNNER_OS == 'macOS' ]] && echo $(pwd)/mosek.lic || echo $(realpath mosek.lic) )" >> $GITHUB_ENV
-      - uses: actions/setup-python@v5
+          echo $KNITRO_LICENSE > ~/artelys_lic.txt
+
+      - uses: astral-sh/setup-uv@v6
         with:
           python-version: 3.12
-      - uses: conda-incubator/setup-miniconda@v3
+          enable-cache: true
+      - uses: actions/checkout@v5
+      - name: Setup Julia 
+        uses: julia-actions/setup-julia@v2
         with:
-          auto-update-conda: true
-          python-version: 3.12
-          channels: conda-forge,anaconda
-      - uses: actions/checkout@v4
+          version: 'lts'
+      - name: Install COSMO
+        run: julia -e 'using Pkg; Pkg.add("COSMO")'
       - name: Install cvxpy dependencies and all optional solvers
-        run: |
-          source continuous_integration/install_optional_solvers.sh
-          pip install . pytest hypothesis
+        run: uv sync --all-extras --dev
       - name: Print installed solvers
         run : |
-          python -c "import cvxpy; print(cvxpy.installed_solvers())" 
+          uv run python -c "import cvxpy; print(cvxpy.installed_solvers())" 
       - name: Run test_conic_solvers
         run : |
-          pytest -rs cvxpy/tests/test_conic_solvers.py
+          uv run pytest -rs cvxpy/tests/test_conic_solvers.py
+      - name: Run test_qp_solvers
+        if: always()
+        run : |
+          uv run pytest -rs cvxpy/tests/test_qp_solvers.py
 
     env:
+      UV_SYSTEM_PYTHON: 1
       RUNNER_OS: ${{ matrix.os }}
-      PYTHON_VERSION: 3.12
+      PYTHON_VERSION: 3.12
+      KNITRO_LICENSE: ${{ secrets.KNITRO_LICENSE }}

CONTRIBUTING.md

@@ -48,7 +48,7 @@ following:
 * Browse the [issue tracker](https://github.com/cvxpy/cvxpy/issues), and
   look for the issues tagged "help wanted".
 * Polish the [example library](https://www.cvxpy.org/examples/index.html) or add new examples
-* Add a [benchmark](https://github.com/cvxpy/cvxpy/tree/master/cvxpy/tests/test_benchmarks.py)
+* Add a [benchmark](https://github.com/cvxpy/benchmarks)
 
 ## License
 Please add the following license to new files:
@@ -128,13 +128,17 @@ Please make sure that your change doesn't cause any of the unit tests to fail.
 to `pytest`.
 
 ## Benchmarks
-CVXPY has a few benchmarks in `cvxpy/tests/test_benchmarks.py`, which test
-the time to canonicalize problems. Please run
+CVXPY benchmarks are in a separate repository at 
+[github.com/cvxpy/benchmarks](https://github.com/cvxpy/benchmarks). 
+The benchmarks use [Airspeed Velocity](https://asv.readthedocs.io/) to test
+the time to canonicalize problems.
 
-```
-pytest -s cvxpy/tests/test_benchmarks.py
-```
+To run benchmarks locally:
+1. Clone the benchmarks repository
+2. Install with `pip install -e .`
+3. Run benchmarks with `asv run`
+
+For more details, see the [benchmarks README](https://github.com/cvxpy/benchmarks/blob/main/README.md).
 
-with and without your change, to make sure no performance regressions are
-introduced. If you are making a code contribution, please include the output of
-the above command (with and without your change) in your pull request.
+When making performance-sensitive changes, please verify that no regressions are
+introduced by running the relevant benchmarks.

README.md

@@ -81,12 +81,12 @@ conda install -c conda-forge cvxpy
 
 CVXPY has the following dependencies:
 
-- Python >= 3.9
+- Python >= 3.11
 - Clarabel >= 0.5.0
 - OSQP >= 0.6.2
 - SCS >= 3.2.4.post1
-- NumPy >= 1.21.6
-- SciPy >= 1.11.0
+- NumPy >= 1.22.4
+- SciPy >= 1.13.0
 
 For detailed instructions, see the [installation
 guide](https://www.cvxpy.org/install/index.html).

continuous_integration/install_dependencies.sh

@@ -4,23 +4,32 @@
 # variables defined in the build.yml in .github/workflows/.
 
 set -e
+uv venv
+if [[ "$RUNNER_OS" == "Windows" ]]; then
+  . .venv/Scripts/activate
+else
+  . .venv/bin/activate
+fi
+
+#if  [[ "$RUNNER_OS" == "Linux" ]]; then 
+#  sudo apt install openblas
+#fi
 
-conda config --set remote_connect_timeout_secs 30.0
-conda config --set remote_max_retries 10
-conda config --set remote_backoff_factor 2
-conda config --set remote_read_timeout_secs 120.0
-conda install mkl pip pytest pytest-cov hypothesis openblas "setuptools>65.5.1"
+uv pip install pytest pytest-cov hypothesis "setuptools>65.5.1"
 
-conda install scs
-python -m pip install clarabel osqp
+uv pip install scs clarabel osqp
+
+if [[ "$RUNNER_OS" != "macOS" ]]; then
+  uv pip install mkl
+fi
 
 # Install newest stable versions for Python 3.13.
 if [[ "$PYTHON_VERSION" == "3.13" ]]; then
-  conda install scipy numpy
+  uv pip install scipy numpy
 else
-  conda install scipy=1.13.0 numpy=1.26.4
+  uv pip install scipy==1.13.0 numpy==1.26.4
 fi
 
-if [[ "$USE_OPENMP" == "True" ]]; then
-  conda install -c conda-forge openmp
-fi
+#if [[ "$USE_OPENMP" == "True" ]]; then
+  #uv pip install openmp
+#fi