Change lambda capture to capture-by-reference in example plugin.

Build and run example plugin during Ubuntu "stress test" CI. Closes #920
molpopgen · Apr 3, 2022 · 838a90e · 838a90e
1 parent 895664a
commit 838a90e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -113,6 +113,12 @@ jobs:
         run: |
             python -m pytest -n 2 tests
 
+      - name: Build and run examples/plugin
+        run: |
+          CPPFLAGS=$CPPFLAGS CC=$CC CXX=$CXX PYTHONPATH=. cmake examples/plugin
+          make
+          PYTHONPATH=. python examples/plugin/test_plugin.py
+
       - name: Validate the sdist
         run: |
             python setup.py sdist

diff --git a/doc/misc/changelog.md b/doc/misc/changelog.md
@@ -14,6 +14,9 @@ Bug fixes
   Issue {issue}`881`.
   {user}`apragsdale`,
   {user}`molpopgen`.
+* Fix lambda capture in `examples/plugin/gvalue_recorder.cc`.
+  The previous code was not compatible with current versions of `pybind11`.
+  PR {pr}`921`. Issue {issue}`920`.
 
 * User interface improvements
 

diff --git a/examples/plugin/gvalue_recorder.cc b/examples/plugin/gvalue_recorder.cc
@@ -5,10 +5,10 @@
 
 PYBIND11_MODULE(gvalue_recorder, m)
 {
-    m.def("record_gvalue", [](pybind11::list l) {
+    m.def("record_gvalue", []() {
         return pybind11::cpp_function(
-            [l](const fwdpy11::DiploidPopulation &pop,
-                fwdpy11::SampleRecorder &) {
+            [](const fwdpy11::DiploidPopulation &pop,
+                pybind11::list l) {
                 double mean_trait_value = 0.0;
                 for (auto &md : pop.diploid_metadata)
                     {

diff --git a/examples/plugin/test_plugin.py b/examples/plugin/test_plugin.py
@@ -21,7 +21,13 @@
 rng = fwdpy11.GSLrng(42)
 
 gvalues = []
-r = gvalue_recorder.record_gvalue(gvalues)
+rg = gvalue_recorder.record_gvalue()
+
+
+def r(pop, _):
+    rg(pop, gvalues)
+
+
 fwdpy11.evolvets(rng, pop, params, 100, r)
 
 assert len(gvalues) == pop.generation, "Callback failure"
diff --git a/requirements/conda_minimal_deps.txt b/requirements/conda_minimal_deps.txt
@@ -1,5 +1,5 @@
 intervaltree
-pybind11==2.6.0
+pybind11>=2.6.0
 numpy
 sparse
 scipy