remove abi_tag from variant

Co-authored-by: Isuru Fernando <isuruf@gmail.com>

Author: lucascolley

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

Tools/pixi-packages/recipe.yaml

@@ -1,6 +1,7 @@
 context:
-  # Keep up to date
   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

Tools/pixi-packages/variants.yaml

@@ -1,4 +1,8 @@
 version: ["3.16"]
+variant: ["default", "asan", "freethreading", "tsan_freethreading"]
+
+openssl:
+  - '3.5'
 
 c_compiler:
   - clang
@@ -8,10 +12,3 @@ cxx_compiler:
   - clangxx
 cxx_compiler_version:
   - 21
-
-openssl:
-  - '3.5'
-
-zip_keys: [["variant", "abi_tag"]]
-variant: ["default", "asan",       "freethreading", "tsan_freethreading"]
-abi_tag: ["cp316",   "asan_cp316", "cp316t",        "tsan_cp316t"]