Skip to content

Commit 5291957

Browse files
authored
Merge pull request #16 from AnacondaRecipes/v2.13.6
v2.13.6
2 parents 479f475 + 3a3b9b4 commit 5291957

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

recipe/meta.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% set version = "2.12.0" %}
2-
{% set sha256 = "bf8f242abd1abcd375d516a7067490fb71abd79519a282d22b6e4d19282185a7" %}
1+
{% set version = "2.13.6" %}
2+
{% set sha256 = "e08cb87f4773da97fa7b5f035de8763abc656d87d5773e62f6da0587d1f0ec20" %}
33

44
# this is set to PYBIND11_INTERNALS_VERSION
55
# pybind11 now defines two ABI version. 4 and 5 for 3.12+ or msvc.
@@ -17,17 +17,23 @@ source:
1717
fn: pybind11-{{ version }}.tar.gz
1818
url: https://github.com/pybind/pybind11/archive/v{{ version }}.tar.gz
1919
sha256: {{ sha256 }}
20+
patches: # [win]
21+
- patches/0000_win_fix_paths.patch # [win]
2022

2123
build:
2224
number: 0
2325

26+
requirements:
27+
build: # [win]
28+
- m2-patch # [win]
2429
outputs:
2530
- name: pybind11-abi
2631
version: {{ abi_version }}
2732
build:
2833
number: {{ abi_buildnumber }}
2934
noarch: generic
30-
skip: true # [not linux and x86_64]
35+
# This is currently skipped until `skip-existing` works correctly.
36+
skip: true
3137
run_exports:
3238
- pybind11-abi =={{ abi_version }}
3339
test:
@@ -91,7 +97,7 @@ outputs:
9197
- test -f ${PREFIX}/include/pybind11/pybind11.h # [unix]
9298
- if exist %LIBRARY_INC%\pybind11\pybind11.h (exit 0) else (exit 1) # [win]
9399
- test -f $(python -c "import pybind11 as py; print(py.get_include())")/pybind11/pybind11.h # [unix]
94-
- if exist $(python -c "import pybind11 as py; print(py.get_include())")\pybind11\pybind11.h (exit 0) else (exit 1) # [win]
100+
- if not exist %SP_DIR%\pybind11\include\pybind11\pybind11.h exit 1 # [win]
95101

96102
about:
97103
home: https://github.com/pybind/pybind11/
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/setup.py b/setup.py
2+
index 96563c1a..80e6ae5d 100644
3+
--- a/setup.py
4+
+++ b/setup.py
5+
@@ -122,10 +122,14 @@ def remove_output(*sources: str) -> Generator[None, None, None]:
6+
with remove_output("pybind11/include", "pybind11/share"):
7+
# Generate the files if they are not present.
8+
with TemporaryDirectory() as tmpdir:
9+
- cmd = ["cmake", "-S", ".", "-B", tmpdir] + [
10+
+ cmd = ["cmake", '-GVisual Studio 16 2019', "-S", ".", "-B", tmpdir] + [
11+
"-DCMAKE_INSTALL_PREFIX=pybind11",
12+
"-DBUILD_TESTING=OFF",
13+
"-DPYBIND11_NOPYTHON=ON",
14+
+ '-DPYTHON_EXECUTABLE:FILEPATH='+os.environ.get("PYTHON",""),
15+
+ '-DPYTHON_LIBRARY:FILEPATH='+os.environ.get("PYTHON_LIBRARY",""),
16+
+ '-DPYTHON_INCLUDE_DIR:PATH='+os.environ.get("PREFIX","")+ '\include',
17+
+ '-DCMAKE_PREFIX_PATH='+os.environ.get("LIBRARY_PREFIX",""),
18+
"-Dprefix_for_pc_file=${pcfiledir}/../../",
19+
]
20+
if "CMAKE_ARGS" in os.environ:
21+

0 commit comments

Comments
 (0)