cvxpy v1.5.2 (#94)

automerged PR by conda-forge/automerge-action

.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:

recipe/meta.yaml

@@ -1,19 +1,19 @@
 {% set name = "cvxpy" %}
-{% set version = "1.5.1" %}
+{% set version = "1.5.2" %}
 
 package:
   name: cvxpy-split
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 225c90abe61a143dde2ff72d1acf9875b58d8c047ad589abc1b735640735dbfc
+  sha256: 8231f006f6b55da141758282aecb788b3b5742448765dba6a9440b6336080ce3
   patches:
-    # avoid https://github.com/cvxpy/cvxpy/issues/2447
-    - patches/0001-reinstate-package-name-in-setup.py.patch
+    # test that fails due to timing issues on slow CI agents when in emulation
+    - patches/0001-loosen-time-limit-in-test_scipy_mi_time_limit_reache.patch
 
 build:
-  number: 1
+  number: 0
 
 # Need these up here for conda-smithy to handle them properly.
 requirements:

recipe/patches/0001-loosen-time-limit-in-test_scipy_mi_time_limit_reache.patch

@@ -0,0 +1,22 @@
+From 5868af2b7649031ad86c069839ef1d199c1079f2 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <[email protected]>
+Date: Wed, 19 Jun 2024 10:31:29 +1100
+Subject: [PATCH] loosen time-limit in test_scipy_mi_time_limit_reached
+
+---
+ cvxpy/tests/test_conic_solvers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cvxpy/tests/test_conic_solvers.py b/cvxpy/tests/test_conic_solvers.py
+index ad2206eb3..083272a19 100644
+--- a/cvxpy/tests/test_conic_solvers.py
++++ b/cvxpy/tests/test_conic_solvers.py
+@@ -2229,7 +2229,7 @@ class TestSCIPY(unittest.TestCase):
+         sth = sths.mi_lp_7()
+
+         # We only check that the option does not raise an error.
+-        sth.solve(solver='SCIPY', scipy_options={"time_limit": 0.1})
++        sth.solve(solver='SCIPY', scipy_options={"time_limit": 1})
+
+     @unittest.skipUnless('SCIPY' in INSTALLED_MI_SOLVERS, 'SCIPY version cannot solve MILPs')
+     def test_scipy_mi_solver_stats(self) -> None: