Skip to content

Commit

Permalink
Fixed with new submodule address.
Browse files Browse the repository at this point in the history
Note that now we are explicitely tracking branches and the tracked branch of submodules is normally mater, a part from Extras/json which tracks the branch PACS.
  • Loading branch information
lformaggia committed Aug 15, 2023
1 parent b0af5e1 commit f7373eb
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 21 deletions.
26 changes: 20 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,25 +1,39 @@
[submodule "Examples/src/LinearAlgebra/CppNumericalSolvers"]
path = Examples/src/LinearAlgebra/CppNumericalSolvers
url = [email protected]:lformaggia/CppNumericalSolvers.git
url = [email protected]:pacs-course/CppNumericalSolvers.git
[submodule "Examples/src/LinearAlgebra/spectra"]
path = Examples/src/LinearAlgebra/spectra
url = [email protected]:lformaggia/spectra.git
url = [email protected]:pacs-course/spectra.git
[submodule "Examples/src/LinearAlgebra/redsvd-h"]
path = Examples/src/LinearAlgebra/redsvd-h
url = [email protected]:lformaggia/redsvd-h.git
url = [email protected]:pacs-course/redsvd-h.git
[submodule "Extras/muparser"]
path = Extras/muparser
url = [email protected]:lformaggia/muparser.git
url = [email protected]:pacs-course/muparser.git
[submodule "Extras/muparserx"]
path = Extras/muparserx
url = [email protected]:lformaggia/muparserx.git
url = [email protected]:pacs-course/muparserx.git
[submodule "Extras/json"]
path = Extras/json
url = [email protected]:lformaggia/json.git
url = [email protected]:pacs-course/json.git
branch = PACS
[submodule "Extras/pybind11"]
path = Extras/pybind11
url = [email protected]:pacs-course/pybind11.git
[submodule "Examples/src/pybind11/pybind11_examples"]
path = Examples/src/pybind11/pybind11_examples
url = [email protected]:pacs-course/pybind11_examples.git
[submodule "json"]
branch = PACS
[submodule "muparser"]
branch = master
[submodule "muparserx"]
branch = master
[submodule "spectra"]
branch = master
[submodule "redsvd-h"]
branch = master
[submodule "CppNumericalSolvers/"]
branch = master
[submodule "pybind11"]
branch = master
2 changes: 1 addition & 1 deletion Extras/json
Submodule json updated 146 files
2 changes: 1 addition & 1 deletion Extras/muparserx
Submodule muparserx updated 104 files
2 changes: 1 addition & 1 deletion Extras/pybind11
Submodule pybind11 updated 87 files
+102 −41 .github/workflows/ci.yml
+13 −5 .github/workflows/configure.yml
+3 −0 .github/workflows/format.yml
+5 −0 .github/workflows/labeler.yml
+6 −2 .github/workflows/pip.yml
+15 −11 .github/workflows/upstream.yml
+54 −50 .pre-commit-config.yaml
+19 −2 .readthedocs.yml
+8 −5 CMakeLists.txt
+1 −1 MANIFEST.in
+1 −1 README.rst
+13 −0 SECURITY.md
+7 −3 docs/advanced/cast/strings.rst
+1 −1 docs/advanced/embedding.rst
+12 −11 docs/advanced/exceptions.rst
+1 −1 docs/advanced/functions.rst
+29 −0 docs/advanced/misc.rst
+101 −1 docs/changelog.rst
+14 −0 docs/classes.rst
+7 −4 docs/compiling.rst
+2 −1 docs/faq.rst
+86 −40 docs/release.rst
+14 −0 docs/upgrade.rst
+14 −2 include/pybind11/attr.h
+16 −1 include/pybind11/buffer_info.h
+44 −4 include/pybind11/cast.h
+3 −3 include/pybind11/detail/class.h
+18 −8 include/pybind11/detail/common.h
+2 −2 include/pybind11/detail/init.h
+3 −2 include/pybind11/detail/internals.h
+185 −27 include/pybind11/detail/type_caster_base.h
+9 −0 include/pybind11/eigen/common.h
+13 −0 include/pybind11/eigen/matrix.h
+5 −0 include/pybind11/eigen/tensor.h
+14 −8 include/pybind11/numpy.h
+25 −17 include/pybind11/pybind11.h
+116 −30 include/pybind11/pytypes.h
+4 −4 include/pybind11/stl.h
+5 −3 include/pybind11/stl_bind.h
+61 −0 include/pybind11/type_caster_pyobject_ptr.h
+97 −0 include/pybind11/typing.h
+1 −1 pybind11/_version.py
+4 −9 pybind11/setup_helpers.py
+11 −8 pyproject.toml
+1 −0 setup.cfg
+1 −1 setup.py
+8 −7 tests/CMakeLists.txt
+2 −2 tests/cross_module_interleaved_error_already_set.cpp
+4 −0 tests/extra_python_package/test_files.py
+4 −4 tests/pybind11_cross_module_tests.cpp
+1 −1 tests/requirements.txt
+35 −0 tests/test_buffers.cpp
+57 −0 tests/test_buffers.py
+1 −1 tests/test_class.cpp
+0 −3 tests/test_cmake_build/CMakeLists.txt
+4 −4 tests/test_cmake_build/installed_embed/CMakeLists.txt
+4 −4 tests/test_cmake_build/installed_function/CMakeLists.txt
+4 −4 tests/test_cmake_build/installed_target/CMakeLists.txt
+4 −4 tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+4 −4 tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+4 −4 tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+238 −0 tests/test_copy_move.cpp
+47 −13 tests/test_exceptions.cpp
+1 −1 tests/test_exceptions.h
+37 −9 tests/test_exceptions.py
+29 −29 tests/test_iostream.py
+34 −0 tests/test_methods_and_attributes.cpp
+9 −0 tests/test_methods_and_attributes.py
+26 −0 tests/test_numpy_array.cpp
+71 −0 tests/test_numpy_array.py
+20 −1 tests/test_pytypes.cpp
+49 −1 tests/test_pytypes.py
+6 −3 tests/test_stl.py
+44 −0 tests/test_stl_binders.cpp
+18 −0 tests/test_stl_binders.py
+130 −0 tests/test_type_caster_pyobject_ptr.cpp
+104 −0 tests/test_type_caster_pyobject_ptr.py
+38 −0 tests/test_unnamed_namespace_a.cpp
+34 −0 tests/test_unnamed_namespace_a.py
+13 −0 tests/test_unnamed_namespace_b.cpp
+5 −0 tests/test_unnamed_namespace_b.py
+54 −0 tests/test_vector_unique_ptr_member.cpp
+14 −0 tests/test_vector_unique_ptr_member.py
+18 −8 tools/pybind11Common.cmake
+3 −1 tools/pybind11Config.cmake.in
+7 −5 tools/pybind11NewTools.cmake
+6 −4 tools/pybind11Tools.cmake
12 changes: 6 additions & 6 deletions change_submodules_url_https.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/CppNumericalSolvers.url https://github.com/lformaggia/CppNumericalSolvers.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/spectra.url https://github.com/lformaggia/spectra.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/redsvd-h.url https://github.com/lformaggia/redsvd-h.git
git config --file=.gitmodules submodule.Extras/muparser.url https://github.com/lformaggia/muparser.git
git config --file=.gitmodules submodule.Extras/muparserx.url https://github.com/lformaggia/muparserx.git
git config --file=.gitmodules submodule.Extras/json.url https://github.com/lformaggia/json.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/CppNumericalSolvers.url https://github.com/pacs-course/CppNumericalSolvers.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/spectra.url https://github.com/pacs-course/spectra.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/redsvd-h.url https://github.com/pacs-course/redsvd-h.git
git config --file=.gitmodules submodule.Extras/muparser.url https://github.com/pacs-course/muparser.git
git config --file=.gitmodules submodule.Extras/muparserx.url https://github.com/pacs-course/muparserx.git
git config --file=.gitmodules submodule.Extras/json.url https://github.com/pacs-course/json.git
git submodule sync
git submodule update --recursive --remote

12 changes: 6 additions & 6 deletions change_submodules_url_ssh.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/CppNumericalSolvers.url [email protected]:lformaggia/CppNumericalSolvers.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/spectra.url [email protected]:lformaggia/spectra.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/redsvd-h.url [email protected]:lformaggia/redsvd-h.git
git config --file=.gitmodules submodule.Extras/muparser.url [email protected]:lformaggia/muparser.git
git config --file=.gitmodules submodule.Extras/muparserx.url [email protected]:lformaggia/muparserx.git
git config --file=.gitmodules submodule.Extras/json.url [email protected]:lformaggia/json.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/CppNumericalSolvers.url [email protected]:pacs-course/CppNumericalSolvers.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/spectra.url [email protected]:pacs-course/spectra.git
git config --file=.gitmodules submodule.Examples/src/LinearAlgebra/redsvd-h.url [email protected]:pacs-course/redsvd-h.git
git config --file=.gitmodules submodule.Extras/muparser.url [email protected]:pacs-course/muparser.git
git config --file=.gitmodules submodule.Extras/muparserx.url [email protected]:pacs-course/muparserx.git
git config --file=.gitmodules submodule.Extras/json.url [email protected]:pacs-course/json.git
git submodule sync
git submodule update --recursive --remote

0 comments on commit f7373eb

Please sign in to comment.