Using py::embed instead of CPython C API

SylvainCorlay · SylvainCorlay · commit b8299c13a839 · 2018-11-16T12:09:04.000+01:00
diff --git a/test/downloadGTest.cmake.in b/test/downloadGTest.cmake.in
@@ -13,7 +13,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
     GIT_REPOSITORY    https://github.com/google/googletest.git
-    GIT_TAG           release-1.8.0
+    GIT_TAG           release-1.8.1
     SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
     BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
     CONFIGURE_COMMAND ""
diff --git a/test/main.cpp b/test/main.cpp
@@ -6,30 +6,29 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
-// Required to avoid the error "std does not have memeber copysign"
+// Required to avoid the error "std does not have member copysign"
 #include <cmath>
-#include <Python.h>
 
-#include "pybind11/numpy.h"
+#include "gtest/gtest.h"
+
+#include <pybind11/embed.h>
 
 #define FORCE_IMPORT_ARRAY
 #include "xtensor-python/pyarray.hpp"
 
-#include "gtest/gtest.h"
-#include <iostream>
+namespace py = pybind11;
 
 int main(int argc, char* argv[])
 {
-    // Initialize all the things (google-test and Python interpreter)
-    Py_Initialize();
+    // Initialize all the things (Python, numpy, gtest)
+    py::scoped_interpreter guard{};
     xt::import_numpy();
     ::testing::InitGoogleTest(&argc, argv);
 
     // Run test suite
     int ret = RUN_ALL_TESTS();
 
-    // Closure of the Python interpreter
-    Py_Finalize();
+    // Return test results
     return ret;
 }
 
