Create python wrapper so that mac wheels will work

* need to work around: matthew-brett/delocate#22
BlueBrain · Mar 12, 2020 · 18b7a43 · 18b7a43
1 parent 46bfa10
commit 18b7a43
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,7 +43,7 @@ option(${PROJECT_NAME}_CXX_WARNINGS "Compile C++ with warnings as errors" ON)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(SONATA_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)

diff --git a/libsonata/__init__.py b/libsonata/__init__.py
@@ -0,0 +1,19 @@
+# Needed so that mac wheels properly delocate:
+#  https://github.com/matthew-brett/delocate/issues/22
+
+from _libsonata import (EdgePopulation,
+                        EdgeStorage,
+                        ElementsDataFrame,
+                        ElementsReportPopulation,
+                        ElementsReportReader,
+                        NodePopulation,
+                        NodeStorage,
+                        Selection,
+                        SomasDataFrame,
+                        SomasReportPopulation,
+                        SomasReportReader,
+                        SonataError,
+                        SpikePopulation,
+                        SpikeReader,
+                        version,
+                        )
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 pybind11_add_module(sonata_python SYSTEM bindings.cpp)
 
 set_target_properties(sonata_python PROPERTIES
-    OUTPUT_NAME "libsonata"
+    OUTPUT_NAME "_libsonata"
 )
 
 target_link_libraries(sonata_python

diff --git a/python/bindings.cpp b/python/bindings.cpp
@@ -360,7 +360,7 @@ void bindReportReader(py::module& m, const std::string& prefix) {
 }
 
 
-PYBIND11_MODULE(libsonata, m) {
+PYBIND11_MODULE(_libsonata, m) {
     py::class_<Selection>(m,
                           "Selection",
                           "ID sequence in the form convenient for querying attributes")

diff --git a/setup.py b/setup.py
@@ -156,7 +156,7 @@ def run(self):
     author="BlueBrain Project, EPFL",
     author_email="[email protected]",
     classifiers=[],
-    ext_modules=[CMakeExtension("libsonata")],
+    ext_modules=[CMakeExtension("_libsonata")],
     cmdclass=lazy_dict(
         build_ext=CMakeBuild,
         test_ext=CMakeBuild,
@@ -166,5 +166,8 @@ def run(self):
     zip_safe=False,
     setup_requires=setup_requires,
     install_requires=install_requires,
-    use_scm_version=True,
+    use_scm_version={"local_scheme": "no-local-version",
+                     },
+    packages=['libsonata',
+              ],
 )