diff --git a/.gitmodules b/.gitmodules index 48e7545d46028ef35caa4d6de57d5031f52a5e2f..92278900adfe1a86a2f711d380964056d67d214c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "deps/evalhyd"] - path = deps/evalhyd - url = https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd.git - branch = dev [submodule "deps/xtl"] path = deps/xtl url = https://github.com/xtensor-stack/xtl.git @@ -11,3 +7,6 @@ [submodule "deps/xtensor"] path = deps/xtensor url = https://github.com/xtensor-stack/xtensor.git +[submodule "deps/evalhyd-cpp"] + path = deps/evalhyd-cpp + url = https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-cpp.git diff --git a/deps/evalhyd b/deps/evalhyd deleted file mode 160000 index 31cf8da51a415301a7a1842b5dbc0ecdd3fff1b1..0000000000000000000000000000000000000000 --- a/deps/evalhyd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 31cf8da51a415301a7a1842b5dbc0ecdd3fff1b1 diff --git a/deps/evalhyd-cpp b/deps/evalhyd-cpp new file mode 160000 index 0000000000000000000000000000000000000000..d86043f5a28b697a902cc52842ed439583f5f42d --- /dev/null +++ b/deps/evalhyd-cpp @@ -0,0 +1 @@ +Subproject commit d86043f5a28b697a902cc52842ed439583f5f42d diff --git a/environment.yml b/environment.yml index a1be539bbcb7aed7e0412d774a780f32757afc47..691609ddc3eb4bdeece89f6d703311c019660494 100644 --- a/environment.yml +++ b/environment.yml @@ -12,6 +12,6 @@ dependencies: - numpy - pybind11 - xtensor-python==0.26.1 -#TODO: - evalhyd==0.0.1 + - evalhyd-cpp==0.1.0 # Test dependencies - numpy diff --git a/setup.py b/setup.py index 46803fc398e5e0dff1c698f01dc28fbe4d47d23b..cfa265bf529fbc65f7fb736ae73c637598687251 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open("evalhyd/version.py", 'r') as fv: exec(fv.read()) # vendor dependencies (unless told otherwise via environment variable) -deps = ['xtl', 'xtensor', 'xtensor-python', 'evalhyd'] +deps = ['xtl', 'xtensor', 'xtensor-python', 'evalhyd-cpp'] deps_blank_path = os.path.join(os.getcwd(), 'deps', '{}', 'include') deps_include_dirs = []