From 64982f61ac00b2436d50a152b12a21ffe679f022 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Tue, 18 Jun 2024 08:42:01 +0000
Subject: [PATCH 1/4] updated v1.5.2

---
 recipe/meta.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 0c12340..1165d75 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "cvxpy" %}
-{% set version = "1.5.1" %}
+{% set version = "1.5.2" %}
 
 package:
   name: cvxpy-split
@@ -7,13 +7,13 @@ package:
 
 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
 
 build:
-  number: 1
+  number: 0
 
 # Need these up here for conda-smithy to handle them properly.
 requirements:

From 9c9c450d00fcb38d649b914aee960315245c015e Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Tue, 18 Jun 2024 08:43:42 +0000
Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.5.1, conda-smithy
 3.36.2, and conda-forge-pinning 2024.06.18.06.09.12

---
 .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml    | 2 ++
 .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml     | 2 ++
 .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml     | 2 ++
 .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml     | 2 ++
 .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml    | 2 ++
 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml    | 2 ++
 .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 ++
 .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml  | 2 ++
 .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml  | 2 ++
 .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 ++
 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml | 2 ++
 .gitattributes                                             | 4 ++--
 .scripts/build_steps.sh                                    | 7 +++++++
 .scripts/run_osx_build.sh                                  | 7 +++++++
 .scripts/run_win_build.bat                                 | 5 +++++
 15 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
index 0bf9c7b..06541b4 100644
--- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
index dfb5eb1..abde8bf 100644
--- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml
index 288ecf1..c270d5e 100644
--- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml
+++ b/.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:
diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
index 712da2a..2c034d3 100644
--- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
index c24f4af..b4d1b27 100644
--- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml
index 5f2184a..e8df64b 100644
--- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
index 915df3f..404bb84 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
index 10d3812..ec14975 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
index c078bba..1040d3f 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
index cda0909..6b6fe86 100644
--- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
+++ b/.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:
diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
index 9861188..d0b139a 100644
--- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
+++ b/.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:
diff --git a/.gitattributes b/.gitattributes
index 7f32763..18f114a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,8 +20,8 @@ bld.bat text eol=crlf
 .travis.yml linguist-generated=true
 .scripts/* linguist-generated=true
 .woodpecker.yml linguist-generated=true
-LICENSE.txt linguist-generated=true
-README.md linguist-generated=true
+/LICENSE.txt linguist-generated=true
+/README.md linguist-generated=true
 azure-pipelines.yml linguist-generated=true
 build-locally.py linguist-generated=true
 shippable.yml linguist-generated=true
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 899ba03..a5836e8 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -72,6 +72,13 @@ else
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
+
+    ( startgroup "Inspecting artifacts" ) 2> /dev/null
+
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+
+    ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
 
     validate_recipe_outputs "${FEEDSTOCK_NAME}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 07dff21..ba0c879 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -85,6 +85,13 @@ else
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
         --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
+
+    ( startgroup "Inspecting artifacts" ) 2> /dev/null
+
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+
+    ( endgroup "Inspecting artifacts" ) 2> /dev/null
     ( startgroup "Validating outputs" ) 2> /dev/null
 
     validate_recipe_outputs "${FEEDSTOCK_NAME}"
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
index 6d54697..65650bf 100755
--- a/.scripts/run_win_build.bat
+++ b/.scripts/run_win_build.bat
@@ -58,6 +58,11 @@ echo Building recipe
 conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
 if !errorlevel! neq 0 exit /b !errorlevel!
 
+call :start_group "Inspecting artifacts"
+:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
+WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+call :end_group
+
 :: Prepare some environment variables for the upload step
 if /i "%CI%" == "github_actions" (
     set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%"

From 0617a0f8ec66a3f037ade03cd16df6bf6696880a Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Wed, 19 Jun 2024 08:41:50 +1100
Subject: [PATCH 3/4] remove obsolete patch

---
 recipe/meta.yaml                              |  3 ---
 ...1-reinstate-package-name-in-setup.py.patch | 26 -------------------
 2 files changed, 29 deletions(-)
 delete mode 100644 recipe/patches/0001-reinstate-package-name-in-setup.py.patch

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 1165d75..b5db1ff 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -8,9 +8,6 @@ package:
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
   sha256: 8231f006f6b55da141758282aecb788b3b5742448765dba6a9440b6336080ce3
-  patches:
-    # avoid https://github.com/cvxpy/cvxpy/issues/2447
-    - patches/0001-reinstate-package-name-in-setup.py.patch
 
 build:
   number: 0
diff --git a/recipe/patches/0001-reinstate-package-name-in-setup.py.patch b/recipe/patches/0001-reinstate-package-name-in-setup.py.patch
deleted file mode 100644
index cf7150a..0000000
--- a/recipe/patches/0001-reinstate-package-name-in-setup.py.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8f98a4ab4815b8af3768e2206cd98fa8552bcf8c Mon Sep 17 00:00:00 2001
-From: "H. Vetinari" <h.vetinari@gmx.com>
-Date: Thu, 23 May 2024 23:19:50 +1100
-Subject: [PATCH] reinstate package name in setup.py
-
-In https://github.com/cvxpy/cvxpy/commit/d8f74ec152e4ca4b7381d339e9de0004df89beee
-the package name migrated to pyproject.toml, however we delete that file during
-the build because the [build-system] table messes with our installation process
-(and it's cumbersome to patch due to frequent conflicts on version updates);
-adding the name is necessary to avoid https://github.com/cvxpy/cvxpy/issues/2447
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index 79e27c38f..46718fd33 100644
---- a/setup.py
-+++ b/setup.py
-@@ -55,6 +55,7 @@ VERSION = setup_versioning.VERSION
- extensions = [setup_extensions.cvxcore, setup_extensions.sparsecholesky]
- 
- setup(
-+    name="cvxpy",
-     version=str(VERSION),
-     cmdclass={'build_ext': build_ext_cvxpy},
-     ext_modules=extensions if "PYODIDE" not in os.environ else [],

From f8091977764bff3173ee738b652bff89fcb770b6 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Wed, 19 Jun 2024 10:33:15 +1100
Subject: [PATCH 4/4] loosen time_limit in test_scipy_mi_time_limit_reached

---
 recipe/meta.yaml                              |  3 +++
 ...t-in-test_scipy_mi_time_limit_reache.patch | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 recipe/patches/0001-loosen-time-limit-in-test_scipy_mi_time_limit_reache.patch

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index b5db1ff..7703aec 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -8,6 +8,9 @@ package:
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
   sha256: 8231f006f6b55da141758282aecb788b3b5742448765dba6a9440b6336080ce3
+  patches:
+    # 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: 0
diff --git a/recipe/patches/0001-loosen-time-limit-in-test_scipy_mi_time_limit_reache.patch b/recipe/patches/0001-loosen-time-limit-in-test_scipy_mi_time_limit_reache.patch
new file mode 100644
index 0000000..960f57a
--- /dev/null
+++ b/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" <h.vetinari@gmx.com>
+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: