From 3e8876b6d189b47c1a0ba7e7c5a2098da01f951d Mon Sep 17 00:00:00 2001
From: Christopher Rowley <github.com/cjdoris>
Date: Mon, 12 Oct 2026 17:24:04 +0100
Subject: [PATCH] python 3.15 compat fix

---
 CHANGELOG.md           |  1 +
 CondaPkg.toml          | 23 ++++++++++++-----------
 Project.toml           |  2 +-
 benchmark/Project.toml |  1 +
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7673ae1..d03cd5c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+* Compatibility fix with Python 3.15 from conda-forge, which no longer bundles libpython.
 * Bug fixes.
 
 ## 0.9.36 (2026-09-18)
diff --git a/CondaPkg.toml b/CondaPkg.toml
index d0e23a84..8174a3ec 100644
--- a/CondaPkg.toml
+++ b/CondaPkg.toml
@@ -1,18 +1,19 @@
-[deps]
-conda = "=26.7.2"
+[deps.openssl]
+version = "<=julia"
 
-    [deps.openssl]
-    version = "<=julia"
+[deps.libstdcxx]
+version = "<=julia"
 
-    [deps.libstdcxx]
-    version = "<=julia"
+[deps.libstdcxx-ng]
+version = "<=julia"
 
-    [deps.libstdcxx-ng]
-    version = "<=julia"
+[deps.python]
+build = "**cpython**"
+version = ">=3.10,!=3.14.0,!=3.14.1,<4"
 
-    [deps.python]
-    build = "**cpython**"
-    version = ">=3.10,!=3.14.0,!=3.14.1,<4"
+[deps.libpython]
+build = "**bundled-or-separate**"
+channel = "conda-forge"
 
 [dev.deps]
 numpy = ""
diff --git a/Project.toml b/Project.toml
index 4942699c..60d4ca80 100644
--- a/Project.toml
+++ b/Project.toml
@@ -16,7 +16,7 @@ UnsafePointers = "e17b2a0c-0bdf-430a-bd0c-3a23cae4ff39"
 
 [compat]
 CategoricalArrays = "0.10, 1"
-CondaPkg = "0.2.33"
+CondaPkg = "0.2.37"
 Dates = "1"
 Libdl = "1"
 MacroTools = "0.5"
diff --git a/benchmark/Project.toml b/benchmark/Project.toml
index 05a4894b..4f15c788 100644
--- a/benchmark/Project.toml
+++ b/benchmark/Project.toml
@@ -1,2 +1,3 @@
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"