From 00a26c848ac3da19c8e9f597630745f923aeca1c Mon Sep 17 00:00:00 2001
From: Miles Cranmer <miles.cranmer@gmail.com>
Date: Mon, 12 Jun 2023 03:26:40 -0400
Subject: [PATCH 1/3] Option to disable numpy install

---
 deps/build.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deps/build.jl b/deps/build.jl
index 4dd63826..3d04cfba 100644
--- a/deps/build.jl
+++ b/deps/build.jl
@@ -75,7 +75,8 @@ try # make sure deps.jl file is removed on error
     end
 
     use_conda = dirname(python) == abspath(Conda.PYTHONDIR)
-    if use_conda
+    enable_numpy_install = parse(Bool, get(ENV, "PYCALL_INSTALL_NUMPY", "true"))
+    if use_conda && enable_numpy_install
         Conda.add("numpy")
     end
 

From e6f37447816aa977bbb4fb2f6d018bcd66a8c40c Mon Sep 17 00:00:00 2001
From: Miles Cranmer <miles.cranmer@gmail.com>
Date: Mon, 12 Jun 2023 03:39:56 -0400
Subject: [PATCH 2/3] Bump version with numpy install fix

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 54ae595e..eb427dba 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "PyCall"
 uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 authors = ["Steven G. Johnson <stevenj@mit.edu>", "Yichao Yu <yyc1992@gmail.com>", "Takafumi Arakaki <aka.tkf@gmail.com>", "Simon Kornblith <simon@simonster.com>", "Páll Haraldsson <Pall.Haraldsson@gmail.com>", "Jon Malmaud <malmaud@gmail.com>", "Jake Bolewski <jakebolewski@gmail.com>", "Keno Fischer <keno@alumni.harvard.edu>", "Joel Mason <jobba1@hotmail.com>", "Jameson Nash <vtjnash@gmail.com>", "The JuliaPy development team"]
-version = "1.95.1"
+version = "1.95.2"
 
 [deps]
 Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"

From e6a01f69af1f8307a9ba181dbbc66ef89a1759ae Mon Sep 17 00:00:00 2001
From: Miles Cranmer <miles.cranmer@gmail.com>
Date: Mon, 12 Jun 2023 11:32:12 -0400
Subject: [PATCH 3/3] Use `satisfied_skip_solve` in `Conda.add`

---
 Project.toml  | 2 +-
 deps/build.jl | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Project.toml b/Project.toml
index eb427dba..f2462d16 100644
--- a/Project.toml
+++ b/Project.toml
@@ -13,7 +13,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 VersionParsing = "81def892-9a0e-5fdd-b105-ffc91e053289"
 
 [compat]
-Conda = "1.0"
+Conda = "1.9"
 MacroTools = "0.4, 0.5"
 VersionParsing = "1.0"
 julia = "1.4"
diff --git a/deps/build.jl b/deps/build.jl
index 3d04cfba..52b970c8 100644
--- a/deps/build.jl
+++ b/deps/build.jl
@@ -75,9 +75,8 @@ try # make sure deps.jl file is removed on error
     end
 
     use_conda = dirname(python) == abspath(Conda.PYTHONDIR)
-    enable_numpy_install = parse(Bool, get(ENV, "PYCALL_INSTALL_NUMPY", "true"))
-    if use_conda && enable_numpy_install
-        Conda.add("numpy")
+    if use_conda
+        Conda.add("numpy"; satisfied_skip_solve=true)
     end
 
     (libpython, libpy_name) = find_libpython(python)