From 290d4abf7c54edfe0c77cdd9f731dd13dc32a984 Mon Sep 17 00:00:00 2001 From: Nels Frazier Date: Wed, 17 Aug 2022 11:45:46 -0500 Subject: [PATCH 1/3] update submod commit for bug fix --- extern/t-route | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/t-route b/extern/t-route index f4bb30348d..6f8033b713 160000 --- a/extern/t-route +++ b/extern/t-route @@ -1 +1 @@ -Subproject commit f4bb30348df83ff5466455ad7aaeee68150fdb9e +Subproject commit 6f8033b713f5c8ce4a59ef20b93851500a79c12c From ac5217fc4750de4c6c6081eff9e9e3fb21002583 Mon Sep 17 00:00:00 2001 From: Nels Frazier Date: Wed, 17 Aug 2022 12:24:01 -0500 Subject: [PATCH 2/3] fix test data params identity mappings --- test/data/routing/waterbody-params.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/data/routing/waterbody-params.json b/test/data/routing/waterbody-params.json index 96de1f9215..fa5b768ab0 100644 --- a/test/data/routing/waterbody-params.json +++ b/test/data/routing/waterbody-params.json @@ -19,7 +19,7 @@ "TopWdthCC": 169.355, "TopWdth": 56.452, "slope": 0.001, - "toID": 0, + "toID": "tnx-0", "length_m": 5939.3079 } ], @@ -44,8 +44,8 @@ "TopWdthCC": 113.809, "TopWdth": 37.936, "slope": 0.002, - "toID": 45, + "toID": "nex-45", "length_m": 5771.7623 } ] -} \ No newline at end of file +} From ee26cd4f19a7dfe2fe6639002007d45981d50723 Mon Sep 17 00:00:00 2001 From: Nels Frazier Date: Wed, 17 Aug 2022 12:42:08 -0500 Subject: [PATCH 3/3] make sure troute integration updates pip and setuptools --- .github/workflows/module_integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/module_integration.yml b/.github/workflows/module_integration.yml index 189f478f5f..71c9d5e0f5 100644 --- a/.github/workflows/module_integration.yml +++ b/.github/workflows/module_integration.yml @@ -129,7 +129,8 @@ jobs: python3 -m venv .venv . .venv/bin/activate cd extern/t-route - pip install pip + pip install -U pip + pip install -U setuptools pip install -r requirements.txt cd src pip install nwm_routing/