Skip to content

Commit 479f475

Browse files
authored
Merge pull request #15 from AnacondaRecipes/PKG-4361
update to 2.12.0
2 parents 55a19aa + 1222336 commit 479f475

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

recipe/build-pybind11-global.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
:: https://github.com/conda/conda-build/blob/d75ef9c66dbcc832d8d96f33a2aecfe893266e8c/conda_build/build.py#L2517-L2527
33
set PYBIND11_GLOBAL_SDIST=1
44
set PYBIND11_GLOBAL_PREFIX=Library
5-
%PYTHON% -m pip install . -vv --no-build-isolation
5+
%PYTHON% -m pip install . -vv --no-build-isolation --no-deps
66
if errorlevel 1 exit 1

recipe/build-pybind11-global.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# There are several required flags, like --no-deps, but conda-build nicely sets them for us
22
# https://github.com/conda/conda-build/blob/d75ef9c66dbcc832d8d96f33a2aecfe893266e8c/conda_build/build.py#L2517-L2527
33
export PYBIND11_GLOBAL_SDIST=1
4-
$PYTHON -m pip install . -vv --no-build-isolation
4+
$PYTHON -m pip install . -vv --no-build-isolation --no-deps

recipe/build-pybind11.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
:: There are several required flags, like --no-deps, but conda-build nicely sets them for us
22
:: https://github.com/conda/conda-build/blob/d75ef9c66dbcc832d8d96f33a2aecfe893266e8c/conda_build/build.py#L2517-L2527
3-
%PYTHON% -m pip install . -vv --no-build-isolation
3+
%PYTHON% -m pip install . -vv --no-build-isolation --no-deps
44
if errorlevel 1 exit 1

recipe/build-pybind11.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# There are several required flags, like --no-deps, but conda-build nicely sets them for us
22
# https://github.com/conda/conda-build/blob/d75ef9c66dbcc832d8d96f33a2aecfe893266e8c/conda_build/build.py#L2517-L2527
3-
$PYTHON -m pip install . -vv --no-build-isolation
3+
$PYTHON -m pip install . -vv --no-build-isolation --no-deps

recipe/meta.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
{% set version = "2.10.4" %}
2-
{% set sha256 = "832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970" %}
1+
{% set version = "2.12.0" %}
2+
{% set sha256 = "bf8f242abd1abcd375d516a7067490fb71abd79519a282d22b6e4d19282185a7" %}
33

44
# this is set to PYBIND11_INTERNALS_VERSION
5-
{% set abi_version = "4" %}
6-
{% set abi_buildnumber = "1" %}
5+
# pybind11 now defines two ABI version. 4 and 5 for 3.12+ or msvc.
6+
# https://github.com/pybind/pybind11/blob/v2.12.0/include/pybind11/detail/internals.h#L40
7+
{% set abi_version = "4" %} # [py<312 and not win]
8+
{% set abi_buildnumber = "1" %} # [py<312 and not win]
9+
{% set abi_version = "5" %} # [py>=312 or win]
10+
{% set abi_buildnumber = "0" %} # [py>=312 or win]
711

812
package:
913
name: pybind11-split
@@ -31,7 +35,7 @@ outputs:
3135
- include/pybind11/detail/internals.h
3236
commands:
3337
# make sure the internals version matches the package version
34-
- if [[ $(grep "#[[:blank:]]*define PYBIND11_INTERNALS_VERSION" include/pybind11/detail/internals.h | rev | cut -d' ' -f1) != "{{ abi_version }}" ]]; then exit 1; fi
38+
- matched=false; while read -r version; do [ "$version" -eq "{{ abi_version }}" ] && { matched=true; break; }; done < <(awk '/define PYBIND11_INTERNALS_VERSION/{print $NF}' include/pybind11/detail/internals.h); [ "$matched" = true ] && exit 0 || exit 1
3539

3640
- name: pybind11-global
3741
script: build-pybind11-global.sh # [unix]

0 commit comments

Comments
 (0)