From c83c0117877bd246ca7ceec66918c088d386dbd9 Mon Sep 17 00:00:00 2001 From: Bob McElrath Date: Tue, 8 Feb 2022 15:13:40 -0500 Subject: [PATCH] Use upstream pybind11 instead of old pybind11 2.3.dev0 --- .gitmodules | 3 --- deps/pybind11 | 1 - requirements.txt | 4 ++-- reset_pybind11_submodule.sh | 7 ------- 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 160000 deps/pybind11 delete mode 100644 reset_pybind11_submodule.sh diff --git a/.gitmodules b/.gitmodules index cd26efdd7..47dfc9464 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "deps/pybind11"] - path = deps/pybind11 - url = https://github.com/Kisensum/pybind11.git [submodule "deps/dnp3"] path = deps/dnp3 url = https://github.com/automatak/dnp3.git diff --git a/deps/pybind11 b/deps/pybind11 deleted file mode 160000 index 338d615e1..000000000 --- a/deps/pybind11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 338d615e12ce41ee021724551841de3cbe0bc1df diff --git a/requirements.txt b/requirements.txt index 4046d529e..b0d108301 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ attrs==17.4.0 -cmake==0.9.0 funcsigs==1.0.2 pluggy==0.6.0 py==1.5.2 pytest==3.4.0 -six==1.11.0 \ No newline at end of file +six==1.11.0 +pybind11==2.9.1 diff --git a/reset_pybind11_submodule.sh b/reset_pybind11_submodule.sh deleted file mode 100644 index a4f06ccd7..000000000 --- a/reset_pybind11_submodule.sh +++ /dev/null @@ -1,7 +0,0 @@ -git rm --cached deps/pybind11 -rm -rf .git/modules/deps/pybind11 -rm -rf deps/pybind11 -cd deps -git submodule add https://github.com/Kisensum/pybind11.git -git submodule update --init --recursive -cd .. \ No newline at end of file