Skip to content

Commit

Permalink
add patch to unpin pybind11 for pypy
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Nov 18, 2021
1 parent f27af6b commit 28209ae
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 3 deletions.
3 changes: 3 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ source:
sha256: 81241d74ca08df1da5786d6ea2c448cf33d394a5d180c0175bd8f8c3adf20b90
patches:
- patches/0001-redirect-tomlplusplus-include-to-global-library-path.patch
# unpin pybind11 for pypy
- patches/0002-unpin-pybind11-for-pypy.patch # [python_impl == "pypy"]

# ... however, we do include the toml-test submodule; keep in sync with
# https://github.com/bobfang1992/pytomlpp/tree/master/tests/<commit>
- git_url: https://github.com/BurntSushi/toml-test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 15abc347783872a7d5510645e822daabaf16ed58 Mon Sep 17 00:00:00 2001
From af3b646e748f35b634edcb18e67b13d0874c41bc Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Thu, 12 Aug 2021 19:39:51 +0200
Subject: [PATCH] redirect tomlplusplus-include to global library path
Subject: [PATCH 1/2] redirect tomlplusplus-include to global library path

---
include/pytomlpp/pytomlpp.hpp | 2 +-
Expand All @@ -21,5 +21,5 @@ index 96e5b5c..40d4144 100644
// namespace and type forward declarations
namespace py = pybind11;
--
2.31.1.windows.1
2.32.0.windows.2

26 changes: 26 additions & 0 deletions recipe/patches/0002-unpin-pybind11-for-pypy.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 96f66015ea262779d90495e4d6edcb5f7a1b91b2 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 19 Nov 2021 00:57:57 +1100
Subject: [PATCH 2/2] unpin pybind11 for pypy

---
setup.cfg | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 972aa22..2828175 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,8 +26,7 @@ classifiers =
keywords = toml, parser, serilization, deserialization, serdes

[options]
-setup_requires =
- pybind11~=2.8
+setup_requires = pybind11
zip_safe = false
packages = find:
package_dir = =src
--
2.32.0.windows.2

0 comments on commit 28209ae

Please sign in to comment.