Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Update pybind11 version to v2.8.1 release #362

Merged
merged 13 commits into from
Dec 15, 2021
Merged
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
path = 3rdparty/HighFive
url = https://github.com/BlueBrain/HighFive.git
[submodule "3rdparty/pybind11"]
path = 3rdparty/pybind11
path = binds/python/pybind11
url = https://github.com/pybind/pybind11.git
[submodule "3rdparty/GSL_LITE"]
path = 3rdparty/GSL_LITE
Expand Down
6 changes: 0 additions & 6 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ target_include_directories(gsl-lite SYSTEM INTERFACE)

add_library(lexertl INTERFACE)
target_include_directories(lexertl SYSTEM INTERFACE lexertl14/include)

if(BUILD_BINDINGS)
add_subdirectory(pybind11)
target_include_directories(pybind11 SYSTEM INTERFACE
pybind11)
endif()
1 change: 0 additions & 1 deletion 3rdparty/pybind11
Submodule pybind11 deleted from b4e5d5
32 changes: 26 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,36 @@
v3.3.3
======

New Features
* Vasculature section_offsets & section_connectivity (#352)
* n_points method for immutable Morphology and Vasculature (#359)

Fixes:
* Fixed documentation links (#350)
* Python version check >=3.7 (#356)
* Updated pybind11 submodule to v2.8.1 (#362)

v3.3.2
======

Fixes:
* Fixed wheel uploading (#355)

v3.3.1
======

New Features:
* Dendritic spine (#321)

Fixes:
* updated tests
* use std::make_unique (#333)
* don't compile c++ tests when creating python package (#332)
* remove unused AccessMode enum (#331)
* Imbue enums with numeric operations (#330)
* allow lowercase neurite names
* allow whitespace in CellBody neurite
* Remove unused AccessMode enum (#331)
* Don't compile c++ tests when creating python package (#332)
* Use std::make_unique (#333)
* Updated tests (#340)
* Allow lowercase neurite names
* Allow whitespace in CellBody neurite
* Excluded musslinux wheels from building (#354)

Previously:
- The first neurite point is no longer connected to the soma. It was previously
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
include(CompilerFlags)
set(CMAKE_CXX_FLAGS "${FLAGS}")

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if (EXTERNAL_HIGHFIVE)
find_package(HighFive REQUIRED)
endif()
Expand Down
27 changes: 19 additions & 8 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
recursive-include src *
recursive-include binds *
recursive-include include *
# MorphIO c++
graft src
graft include
include CMakeLists.txt

# MorphIO submodule dependencies
include 3rdparty/GSL_LITE/CMakeLists.txt 3rdparty/GSL_LITE/gsl-lite.natvis
recursive-include 3rdparty/GSL_LITE/cmake/ *
recursive-include 3rdparty/GSL_LITE/include/ *
Expand All @@ -11,11 +13,20 @@ recursive-include 3rdparty/HighFive/include/ *
recursive-include 3rdparty/HighFive/CMake/ *
recursive-include 3rdparty/HighFive/doc/ *

recursive-include 3rdparty/pybind11/include/ *
include 3rdparty/pybind11/CMakeLists.txt

include 3rdparty/lexertl14/CMakeLists.txt
recursive-include 3rdparty/lexertl14/include/lexertl/ *

recursive-include 3rdparty/pybind11/tools/ *
include CMakeLists.txt
# pybind11 for python bindings
recursive-include binds/python/pybind11/include *
recursive-include binds/python/pybind11/tools *.cmake
include binds/python/pybind11/CMakeLists.txt
include binds/python/pybind11/LICENSE

# setuptools_scm forces all SCM files to be packaged into sdist
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gorgeous! ~1/10th the size:

-rw-r--r--  1  4535022 Dec 15 08:54 MorphIO-3.3.3.dev15+g16a7222.d20211215.tar.gz
-rw-r--r--  1   478010 Dec 15 08:55 MorphIO-3.3.3.dev17+gd64ba5a.d20211215.tar.gz

# we need to manually exclude them to prevent their inclusion
# see https://github.com/pypa/setuptools_scm/issues/190
prune ci
prune doc
prune tests
prune scripts
prune examples
17 changes: 7 additions & 10 deletions binds/python/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
pybind11_add_module(_morphio
SYSTEM
add_subdirectory(pybind11 EXCLUDE_FROM_ALL)

pybind11_add_module(_morphio SYSTEM
morphio.cpp
bind_immutable.cpp
bindings_utils.cpp
bind_misc.cpp
bind_mutable.cpp
bind_vasculature.cpp
)

target_include_directories(_morphio
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../include
)
)

target_link_libraries(_morphio
PRIVATE
morphio_static)
PRIVATE morphio_static
PRIVATE pybind11::module
)
1 change: 1 addition & 0 deletions binds/python/pybind11
Submodule pybind11 added at f7b499