Fix abi version tests

isuruf · Oct 29, 2024 · 56832b8 · 56832b8
1 parent c9a1864
commit 56832b8
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 12 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_64_.yaml → .ci_support/linux_64_abi_version4.yaml b/.ci_support/linux_64_.yaml → .ci_support/linux_64_abi_version4.yaml
@@ -1,3 +1,5 @@
+abi_version:
+- '4'
 c_stdlib:
 - sysroot
 c_stdlib_version:

diff --git a/.ci_support/linux_64_abi_version5.yaml b/.ci_support/linux_64_abi_version5.yaml
@@ -0,0 +1,29 @@
+abi_version:
+- '5'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '13'
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.13.* *_cp313
+target_platform:
+- linux-64
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,3 +1,5 @@
+abi_version:
+- '5'
 c_stdlib:
 - vs
 channel_sources:

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -0,0 +1,3 @@
+abi_version:
+- 5
+- 4  # [unix]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,9 +1,6 @@
 {% set version = "2.13.6" %}
 {% set sha256 = "e08cb87f4773da97fa7b5f035de8763abc656d87d5773e62f6da0587d1f0ec20" %}
 
-# this is set to PYBIND11_INTERNALS_VERSION
-{% set abi_version = "4" %}
-
 package:
   name: pybind11-split
   version: {{ version }}
@@ -29,12 +26,22 @@ outputs:
       noarch: generic
       run_exports:
         - pybind11-abi =={{ abi_version }}
+    requirements:
+      run:
+        - __unix   # [unix]
+        - __win    # [win]
+        - python >=3.12  # [abi_version == 5 or win]
+        - python <3.12   # [abi_version == 4 and unix]
+      run_constrained:
+        - pybind11-global {{ version }}
+        - pybind11 {{ version }}
     test:
       source_files:
         - include/pybind11/detail/internals.h
+      files:
+        - test-pybind11-abi.sh
       commands:
-        # make sure the internals version matches the package version
-        - if [ $(grep "#define PYBIND11_INTERNALS_VERSION" include/pybind11/detail/internals.h | cut -d' ' -f3) != "{{ abi_version }}" ]; then exit 1; fi  # [unix]
+        - bash test-pybind11-abi.sh {{ abi_version }}  # [unix]
 
   - name: pybind11-global
     script: build-pybind11-global.sh  # [unix]
@@ -58,8 +65,6 @@ outputs:
         # layouts are different on unix vs win
         - __unix        # [unix]
         - __win         # [win]
-      run_constrained:
-        - pybind11-abi =={{ abi_version }}
     test:
       commands:
         - echo "works!"
@@ -86,8 +91,6 @@ outputs:
       run:
         - python
         - pybind11-global {{ PKG_VERSION }}=*_{{ PKG_BUILDNUM }}
-      run_constrained:
-        - pybind11-abi =={{ abi_version }}
     test:
       imports:
         - pybind11
@@ -97,7 +100,7 @@ outputs:
         - test -f ${PREFIX}/include/pybind11/pybind11.h      # [unix]
         - if not exist %LIBRARY_INC%\pybind11\pybind11.h exit 1      # [win]
         - test -f $(python -c "import pybind11 as py; print(py.get_include())")/pybind11/pybind11.h      # [unix]
-        - if not exist $(python -c "import pybind11 as py; print(py.get_include())")\pybind11\pybind11.h exit 1      # [win]
+        - if not exist %SP_DIR%\pybind11\include\pybind11\pybind11.h exit 1      # [win]
 
 about:
   home: https://github.com/pybind/pybind11/

diff --git a/recipe/test-pybind11-abi.sh b/recipe/test-pybind11-abi.sh
@@ -0,0 +1,3 @@
+# make sure the internals version matches the package version
+set -e
+grep "define PYBIND11_INTERNALS_VERSION $1" include/pybind11/detail/internals.h