Merge branch 'master' into master

Author: Transurgeon

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-13, windows-2022 ]
+        os: [ ubuntu-22.04, macos-14, windows-2022 ]
         python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13" ]
         include:
           # These are intended to just add their extra parameter to existing matrix combinations;
@@ -37,7 +37,7 @@ jobs:
             python-version: 3.12
             openmp: "True"
             single_action_config: false
-          - os: macos-13
+          - os: macos-14
             python-version: 3.12
             single_action_config: true
 
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-13, windows-2022 ]
+        os: [ ubuntu-22.04, macos-14, windows-2022 ]
         python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13" ]
         build-cvxpy-base: [ true, false ]  # whether to build cvxpy-base (true) or regular cvxpy (false)
         include:

.github/workflows/test_optional_solvers.yml

@@ -17,7 +17,7 @@ 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
       - name: Set Additional Envs
@@ -50,4 +50,4 @@ jobs:
     env:
       RUNNER_OS: ${{ matrix.os }}
       PYTHON_VERSION: 3.12
-      KNITRO_LICENSE: ${{ secrets.KNITRO_LICENSE }}
+      KNITRO_LICENSE: ${{ secrets.KNITRO_LICENSE }}

continuous_integration/install_dependencies.sh

@@ -9,11 +9,15 @@ 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"
+conda install pip pytest pytest-cov hypothesis openblas "setuptools>65.5.1"
 
 conda install scs
 python -m pip install clarabel osqp
 
+if [[ "$RUNNER_OS" != "macOS" ]]; then
+  conda install mkl
+fi
+
 # Install newest stable versions for Python 3.13.
 if [[ "$PYTHON_VERSION" == "3.13" ]]; then
   conda install scipy numpy