Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,51 @@
path = gitmodules/sundials
url = https://github.com/LLNL/sundials
shallow = true
[submodule "gitmodules/span"]
[submodule "span"]
path = gitmodules/span
url = https://github.com/tcbrindle/span.git
shallow = true
[submodule "gitmodules/string_view-standalone"]
[submodule "string_view-standalone"]
path = gitmodules/string_view-standalone
url = https://github.com/bitwizeshift/string_view-standalone.git
shallow = true
[submodule "gitmodules/camp"]
[submodule "camp"]
path = gitmodules/camp
url = https://github.com/open-atmos/camp
shallow = true
[submodule "gitmodules/SuiteSparse"]
[submodule "SuiteSparse"]
path = gitmodules/SuiteSparse
url = https://github.com/DrTimothyAldenDavis/SuiteSparse
shallow = true
[submodule "gitmodules/json-fortran"]
[submodule "json-fortran"]
path = gitmodules/json-fortran
url = https://github.com/jacobwilliams/json-fortran
shallow = true
[submodule "gitmodules/devops_tests"]
[submodule "devops_tests"]
path = gitmodules/devops_tests
url = https://github.com/open-atmos/devops_tests
shallow = true
[submodule "gitmodules/netcdf-fortran"]
[submodule "netcdf-fortran"]
path = gitmodules/netcdf-fortran
url = https://github.com/Unidata/netcdf-fortran.git
shallow = true
[submodule "gitmodules/netcdf-c"]
[submodule "netcdf-c"]
path = gitmodules/netcdf-c
url = https://github.com/Unidata/netcdf-c.git
shallow = true
[submodule "gitmodules/optional"]
[submodule "optional"]
path = gitmodules/optional
url = https://github.com/TartanLlama/optional.git
shallow = true
[submodule "gitmodules/hdf5"]
[submodule "hdf5"]
path = gitmodules/hdf5
url = https://github.com/HDFGroup/hdf5.git
shallow = true
[submodule "gitmodules/nanobind"]
[submodule "nanobind"]
path = gitmodules/nanobind
url = https://github.com/wjakob/nanobind
[submodule "gitmodules/nanobind_json"]
shallow = true
[submodule "nanobind_json"]
path = gitmodules/nanobind_json
url = https://github.com/Griger5/nanobind_json
[submodule "."]
branch = pypartmc
[submodule "nanobind_json"]
branch = pypartmc
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shouldn't nanobind_json submodule stay at pypartmc branch?

Copy link
Member Author

Choose a reason for hiding this comment

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

if so, let's introduce a test that fails otherwise!

Copy link
Collaborator

Choose a reason for hiding this comment

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

def test_fixed_segfault_case_on_circular_reference():

This test should fail due to circular reference - it fails on my machine. Looking at the main branch of nanobind_json, it shouldn't be even able to compile due to compatibility errors with current nanobind. But it seems that everything worked on CI (could it somehow pulled the "old" submodules?).

Regardless, soon enough we should be able to use the main branch of nanobind_json ;)

Copy link
Member Author

Choose a reason for hiding this comment

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

IIUC, the branch option is only used for submodule updates, while even without specifying it the commit hash registered during last commit points to the specific version of the submodule

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

Right, then it's okay!

shallow = true
Loading