From 8391cd5eeede8a09cb23b98f6c125332baf90cfc Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 22 Apr 2026 11:31:25 -0700
Subject: [PATCH 1/2] Remove version hardcoding in Tools/pixi-packages

---
 Tools/pixi-packages/asan/pixi.toml                   | 1 +
 Tools/pixi-packages/asan/variants.yaml               | 4 ----
 Tools/pixi-packages/build.sh                         | 8 ++++++++
 Tools/pixi-packages/default/pixi.toml                | 1 +
 Tools/pixi-packages/default/recipe.yaml              | 4 +++-
 Tools/pixi-packages/default/variants.yaml            | 4 ----
 Tools/pixi-packages/freethreading/pixi.toml          | 1 +
 Tools/pixi-packages/freethreading/variants.yaml      | 4 ----
 Tools/pixi-packages/tsan-freethreading/pixi.toml     | 1 +
 Tools/pixi-packages/tsan-freethreading/variants.yaml | 4 ----
 10 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Tools/pixi-packages/asan/pixi.toml b/Tools/pixi-packages/asan/pixi.toml
index bf9841e18677cab..c30cf497dcc8f4a 100644
--- a/Tools/pixi-packages/asan/pixi.toml
+++ b/Tools/pixi-packages/asan/pixi.toml
@@ -13,3 +13,4 @@ version = "*"
 
 [package.build.config]
 recipe = "../default/recipe.yaml"
+experimental = true
diff --git a/Tools/pixi-packages/asan/variants.yaml b/Tools/pixi-packages/asan/variants.yaml
index 2404948457e6bb5..bd36139d609750d 100644
--- a/Tools/pixi-packages/asan/variants.yaml
+++ b/Tools/pixi-packages/asan/variants.yaml
@@ -1,6 +1,2 @@
 variant:
   - asan
-abi_tag:
-  - asan_cp315
-version:
-  - 3.15
diff --git a/Tools/pixi-packages/build.sh b/Tools/pixi-packages/build.sh
index 7e22e6243a5f779..948fa09b4554ba9 100644
--- a/Tools/pixi-packages/build.sh
+++ b/Tools/pixi-packages/build.sh
@@ -17,6 +17,14 @@ else
     exit 1
 fi
 
+VER_REF=$(cat configure.ac | grep "\[PYTHON_VERSION\]\, \[" | sed -n 's/.*\[\([0-9.]*\)\].*/\1/p')
+VER=$(echo ${PKG_VERSION} | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
+
+if [[ "${VER_REF}" != "${VER}" ]]; then
+    echo "Unexpected version from conda package. Got ${VER}. Expected ${VER_REF}"
+    exit 1
+fi
+
 # rattler-build by default set a target of 10.9
 # override it to at least 10.12
 case ${MACOSX_DEPLOYMENT_TARGET:-10.12} in
diff --git a/Tools/pixi-packages/default/pixi.toml b/Tools/pixi-packages/default/pixi.toml
index bf9841e18677cab..c30cf497dcc8f4a 100644
--- a/Tools/pixi-packages/default/pixi.toml
+++ b/Tools/pixi-packages/default/pixi.toml
@@ -13,3 +13,4 @@ version = "*"
 
 [package.build.config]
 recipe = "../default/recipe.yaml"
+experimental = true
diff --git a/Tools/pixi-packages/default/recipe.yaml b/Tools/pixi-packages/default/recipe.yaml
index 30d0d5a2ed2e04d..efb71f0ec6c8a7c 100644
--- a/Tools/pixi-packages/default/recipe.yaml
+++ b/Tools/pixi-packages/default/recipe.yaml
@@ -2,8 +2,10 @@
 # propagate the changes to the other variants.
 
 context:
-  # Keep up to date
+  version: ${{ git.latest_tag(".")[1:] }}
   freethreading_tag: ${{ "t" if "freethreading" in variant else "" }}
+  abi_prefix: ${{ (variant | split("-"))[0] + "_" if "san" in variant else "" }}
+  abi_tag: ${{ abi_prefix }}cp${{ (version | split('.'))[:2] | join('') }}
 
 recipe:
   name: python
diff --git a/Tools/pixi-packages/default/variants.yaml b/Tools/pixi-packages/default/variants.yaml
index f66e9e7a2226bab..6567601429e5c51 100644
--- a/Tools/pixi-packages/default/variants.yaml
+++ b/Tools/pixi-packages/default/variants.yaml
@@ -1,6 +1,2 @@
 variant:
   - default
-abi_tag:
-  - cp315
-version:
-  - 3.15
diff --git a/Tools/pixi-packages/freethreading/pixi.toml b/Tools/pixi-packages/freethreading/pixi.toml
index bf9841e18677cab..c30cf497dcc8f4a 100644
--- a/Tools/pixi-packages/freethreading/pixi.toml
+++ b/Tools/pixi-packages/freethreading/pixi.toml
@@ -13,3 +13,4 @@ version = "*"
 
 [package.build.config]
 recipe = "../default/recipe.yaml"
+experimental = true
diff --git a/Tools/pixi-packages/freethreading/variants.yaml b/Tools/pixi-packages/freethreading/variants.yaml
index 022833d04c3821f..5375cd7b53a4a28 100644
--- a/Tools/pixi-packages/freethreading/variants.yaml
+++ b/Tools/pixi-packages/freethreading/variants.yaml
@@ -1,6 +1,2 @@
 variant:
   - freethreading
-abi_tag:
-  - cp315t
-version:
-  - 3.15
diff --git a/Tools/pixi-packages/tsan-freethreading/pixi.toml b/Tools/pixi-packages/tsan-freethreading/pixi.toml
index bf9841e18677cab..c30cf497dcc8f4a 100644
--- a/Tools/pixi-packages/tsan-freethreading/pixi.toml
+++ b/Tools/pixi-packages/tsan-freethreading/pixi.toml
@@ -13,3 +13,4 @@ version = "*"
 
 [package.build.config]
 recipe = "../default/recipe.yaml"
+experimental = true
diff --git a/Tools/pixi-packages/tsan-freethreading/variants.yaml b/Tools/pixi-packages/tsan-freethreading/variants.yaml
index 6ed09fcc9b656bb..280a237e3f148c8 100644
--- a/Tools/pixi-packages/tsan-freethreading/variants.yaml
+++ b/Tools/pixi-packages/tsan-freethreading/variants.yaml
@@ -1,6 +1,2 @@
 variant:
   - tsan-freethreading
-abi_tag:
-  - tsan_cp315t
-version:
-  - 3.15

From 6841508083ef70572d27f71a8eb4bc55f0e2bffd Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 8 Jul 2026 22:05:18 +0530
Subject: [PATCH 2/2] Set version to 3.16 in recipe.yaml

Updated version to 3.16 in recipe.yaml.
---
 Tools/pixi-packages/default/recipe.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Tools/pixi-packages/default/recipe.yaml b/Tools/pixi-packages/default/recipe.yaml
index efb71f0ec6c8a7c..06f5180d58ec689 100644
--- a/Tools/pixi-packages/default/recipe.yaml
+++ b/Tools/pixi-packages/default/recipe.yaml
@@ -2,7 +2,10 @@
 # propagate the changes to the other variants.
 
 context:
-  version: ${{ git.latest_tag(".")[1:] }}
+  # Keep up to date
+  # We could use git.latest_tag(".")[1:], but tags will be wrong until the first alpha
+  # release is tagged.
+  version: 3.16
   freethreading_tag: ${{ "t" if "freethreading" in variant else "" }}
   abi_prefix: ${{ (variant | split("-"))[0] + "_" if "san" in variant else "" }}
   abi_tag: ${{ abi_prefix }}cp${{ (version | split('.'))[:2] | join('') }}