From 043f44e9fbb9c29455fe94177d4ae7af9684dde6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:19:29 +0100 Subject: [PATCH 01/31] Update pre-commit hooks (#1024) Update versions of pre-commit hooks to latest version. Co-authored-by: GitHub --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 02f29b113..c34f7a757 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: exclude: '.teamcity' - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.9 + rev: v0.1.15 hooks: - id: ruff types_or: [python, pyi, jupyter] @@ -26,6 +26,6 @@ repos: hooks: - id: nbstripout - repo: https://github.com/crate-ci/typos - rev: v1.16.26 + rev: v1.17.2 hooks: - id: typos From 20ba9f9c1cfbf76c980b51c74a3d92d09ad2eaa5 Mon Sep 17 00:00:00 2001 From: visser_mn Date: Thu, 1 Feb 2024 12:27:07 +0100 Subject: [PATCH 02/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_api' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimApi.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index 6c485d086..fdfee0800 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -40,7 +40,6 @@ - From 4486e012d85e91709d00f05359db14bb85c6d1be Mon Sep 17 00:00:00 2001 From: visser_mn Date: Thu, 1 Feb 2024 12:27:48 +0100 Subject: [PATCH 03/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimCli.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index 67dd0f46f..cd6f1c0f6 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -40,7 +40,6 @@ - From 296ed7a029b3b923eccfc3ca4a783a7eacc363c0 Mon Sep 17 00:00:00 2001 From: visser_mn Date: Thu, 1 Feb 2024 12:28:12 +0100 Subject: [PATCH 04/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index 2fd093858..d322049a7 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -52,7 +52,6 @@ pixi run test-ribasim-cli]]> - From b1ddf1326c9873f4d83aec694d1b64ef0089472a Mon Sep 17 00:00:00 2001 From: visser_mn Date: Thu, 1 Feb 2024 12:28:34 +0100 Subject: [PATCH 05/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_api' build configuration were updated --- .../Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index 8ba314363..dd3c89bbb 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -52,7 +52,6 @@ pixi run test-ribasim-api]]> - From 6b399dd73764bb5c4f5656261f27e2774013ad6b Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:47:30 +0100 Subject: [PATCH 06/31] TeamCity change in 'Ribasim / Windows' project: snapshot dependency was added in 'Test ribasim_api' build configuration --- .../buildTypes/Ribasim_Windows_TestRibasimApi.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index fdfee0800..c8de2cbe6 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -68,6 +68,15 @@ + + + + + + From 75de03cdd466cd5e4abf2f61f37fa7e66386fb15 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:47:51 +0100 Subject: [PATCH 07/31] TeamCity change in 'Ribasim / Windows' project: artifact dependencies of 'Test ribasim_api' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimApi.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index c8de2cbe6..25a9eeff1 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -64,7 +64,7 @@ - + From c266aaddfc03a7f0b2e6fadedf4d11040e585e54 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:49:06 +0100 Subject: [PATCH 08/31] TeamCity change in 'Ribasim / Windows' project: snapshot dependency was added in 'Test ribasim_cli' build configuration --- .../buildTypes/Ribasim_Windows_TestRibasimCli.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index cd6f1c0f6..5d23aedac 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -68,6 +68,15 @@ + + + + + + From a11ebdf4ff097434fdb351b5570aec212e495c1a Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:49:18 +0100 Subject: [PATCH 09/31] TeamCity change in 'Ribasim / Windows' project: artifact dependencies of 'Test ribasim_cli' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimCli.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index 5d23aedac..d4b5160b7 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -64,7 +64,7 @@ - + From 0421ace1de634bab70c5b08bb4aaacbf0267c739 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:49:52 +0100 Subject: [PATCH 10/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimCli.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index d4b5160b7..8618aab04 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -36,14 +36,7 @@ - - - - - - - - + From b80bc6fd87608b5b473f78d4941e7184d02d4499 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:50:13 +0100 Subject: [PATCH 11/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_api' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimApi.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index 25a9eeff1..daf50a54b 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -36,14 +36,7 @@ - - - - - - - - + From b0470f33ceb112ec26f98238d17c9c9202f73cdd Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:50:49 +0100 Subject: [PATCH 12/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_api' build configuration were updated --- .../Ribasim_Windows_TestRibasimApi.xml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index daf50a54b..f801e917e 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -36,7 +36,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + From b1d080e894b8cd68d508da1086c8082ff96b419b Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:51:09 +0100 Subject: [PATCH 13/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../Ribasim_Windows_TestRibasimCli.xml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index 8618aab04..5547a2610 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -36,7 +36,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + From 9c82ed284bd3a660ffa3ef008300d52d1edc74eb Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:51:55 +0100 Subject: [PATCH 14/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_api' build configuration were updated --- .../buildTypes/Ribasim_Linux_TestRibasimApi.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index dd3c89bbb..56c7d990f 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -48,14 +48,7 @@ pixi run test-ribasim-api]]> - - - - - - - - + From fbf064a7533db511a122c04c2b75b384e92433b3 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:52:09 +0100 Subject: [PATCH 15/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../buildTypes/Ribasim_Linux_TestRibasimCli.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index d322049a7..2a91e10ae 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -48,14 +48,7 @@ pixi run test-ribasim-cli]]> - - - - - - - - + From 51c6d42e84f2b8ae4e6179f68a8ab4d0408eb3ba Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:52:36 +0100 Subject: [PATCH 16/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_api' build configuration were updated --- .../Ribasim_Linux_TestRibasimApi.xml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index 56c7d990f..68a0ace12 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -48,7 +48,30 @@ pixi run test-ribasim-api]]> - + + + + + + + + + + + + + + + + + + + + + + + + From 48300f7703a3c694744bbdd77cd6d56dfe66f90e Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:52:52 +0100 Subject: [PATCH 17/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../Ribasim_Linux_TestRibasimCli.xml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index 2a91e10ae..17b8eccf8 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -48,7 +48,30 @@ pixi run test-ribasim-cli]]> - + + + + + + + + + + + + + + + + + + + + + + + + From cfa46c3451f4fb572ff9d120737f0fdfed5aa415 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:53:14 +0100 Subject: [PATCH 18/31] TeamCity change in 'Ribasim / Linux' project: snapshot dependency was added in 'Test ribasim_api' build configuration --- .../buildTypes/Ribasim_Linux_TestRibasimApi.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index 68a0ace12..eaf983a06 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -95,6 +95,15 @@ pixi run test-ribasim-api]]> + + + + + + From cafcaa257d06f298441a88182c4f7c03c7085fc8 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:53:31 +0100 Subject: [PATCH 19/31] TeamCity change in 'Ribasim / Linux' project: snapshot dependency was added in 'Test ribasim_cli' build configuration --- .../buildTypes/Ribasim_Linux_TestRibasimCli.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index 17b8eccf8..06b404108 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -95,6 +95,15 @@ pixi run test-ribasim-cli]]> + + + + + + From 609bdaf5172a22b09376b2db8caa50ca803fffcb Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:53:39 +0100 Subject: [PATCH 20/31] TeamCity change in 'Ribasim / Linux' project: artifact dependencies of 'Test ribasim_api' build configuration were updated --- .../Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index eaf983a06..998bd6512 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -91,7 +91,7 @@ pixi run test-ribasim-api]]> - + From e9618c14fb2a434c379e14e6e2796294662b472b Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:53:50 +0100 Subject: [PATCH 21/31] TeamCity change in 'Ribasim / Linux' project: artifact dependencies of 'Test ribasim_cli' build configuration were updated --- .../Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index 06b404108..8bbbe7dd2 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -91,7 +91,7 @@ pixi run test-ribasim-cli]]> - + From cb474175aa51f251f23de52be6614a3e3de004a7 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:54:53 +0100 Subject: [PATCH 22/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_api' build configuration were updated --- .../Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml index 998bd6512..f80cb586d 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml @@ -51,7 +51,8 @@ pixi run test-ribasim-api]]> - + ++:v*]]> From b644e85654db2edad979a9182288348b6ec2e1e2 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:55:19 +0100 Subject: [PATCH 23/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml index 8bbbe7dd2..d91e56c86 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml @@ -51,7 +51,8 @@ pixi run test-ribasim-cli]]> - + ++:v*]]> From 63957886b16d316d00d7bd8298ee9342c83f006d Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:55:47 +0100 Subject: [PATCH 24/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_api' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimApi.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml index f801e917e..d87ffa088 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml @@ -39,7 +39,8 @@ - + ++:v*]]> From 0fd2099a750e9ee6fdecae27e2c94974fc4edf2d Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:56:14 +0100 Subject: [PATCH 25/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Test ribasim_cli' build configuration were updated --- .../buildTypes/Ribasim_Windows_TestRibasimCli.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml index 5547a2610..1c01c3577 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml @@ -39,7 +39,8 @@ - + ++:v*]]> From 3966eba26fcd57e84d0f9e6d7c38da731f939563 Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:56:24 +0100 Subject: [PATCH 26/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Build libribasim' build configuration were updated --- .../Ribasim_Linux_BuildLibribasim.xml | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml index 21460aa82..f9dc835a2 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml @@ -49,31 +49,7 @@ pixi run build-libribasim]]> - - - - -+:v*]]> - - - - - - - - - - - - - - - - - - - - + From 3700693de58c4488a8ab0d7dab448d9446d404bf Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:57:02 +0100 Subject: [PATCH 27/31] TeamCity change in 'Ribasim / Linux' project: triggers of 'Build ribasim_cli' build configuration were updated --- .../Ribasim_Linux_BuildRibasimCli.xml | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml index f203da184..466d489bd 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml @@ -56,31 +56,7 @@ pixi run build-ribasim-cli]]> - - - - -+:v*]]> - - - - - - - - - - - - - - - - - - - - + From 2558f4310c1c4554a8f5ffa55c8a7d464ad4b8bb Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:57:27 +0100 Subject: [PATCH 28/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Build libribasim' build configuration were updated --- .../Ribasim_Windows_BuildLibribasim.xml | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml index 72138fa0d..319186ccf 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml @@ -37,31 +37,7 @@ pixi run build-libribasim]]> - - - - -+:v*]]> - - - - - - - - - - - - - - - - - - - - + From db6e94cb70aa1c44f79bc5d5e059085db8ea1bee Mon Sep 17 00:00:00 2001 From: hofer_jn Date: Thu, 1 Feb 2024 12:57:50 +0100 Subject: [PATCH 29/31] TeamCity change in 'Ribasim / Windows' project: triggers of 'Build ribasim_cli' build configuration were updated --- .../Ribasim_Windows_BuildRibasimCli.xml | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml index 42403143f..3d5cfe152 100644 --- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml +++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml @@ -44,31 +44,7 @@ pixi run build-ribasim-cli]]> - - - - -+:v*]]> - - - - - - - - - - - - - - - - - - - - + From 4c4bb52415db8f7e1683a9ec97783c6e3f8b6268 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Thu, 1 Feb 2024 15:57:26 +0100 Subject: [PATCH 30/31] Keep only the root and core project (#1021) This attempts to simplifiy our Julia project and build setup. Where possible, existing projects are moved into the root project like in #1014. All core dependencies are now also direct root dependencies to make using the root project more convenient for development. While working on this I realized that we can remove the `libribasim` and `ribasim_cli` projects entirely. `libribasim` is now a module of the Ribasim package, and `ribasim_cli` already was just a tiny wrapper around `Ribasim.main`. The content of the README.md files from those two folders now reside in the `build_lib` and `build_app` docstring. Since that left only the `create_binaries` folder under `/build`, I collapsed that level out. `create_binaries` is no longer a package, but the code is still used, but now simply directly included in `build.jl`. --- .github/workflows/core_compat_helper.yml | 5 +- .gitignore | 6 +- .../Ribasim_Linux_BuildLibribasim.xml | 2 +- .../Ribasim_Linux_BuildRibasimCli.xml | 4 +- .../Ribasim_Linux_TestRibasimApi.xml | 2 +- .../Ribasim_Linux_TestRibasimCli.xml | 4 +- .../Ribasim_Windows_BuildLibribasim.xml | 2 +- .../Ribasim_Windows_BuildRibasimCli.xml | 4 +- .../Ribasim_Windows_TestRibasimApi.xml | 2 +- .../Ribasim_Windows_TestRibasimCli.xml | 4 +- Manifest.toml | 82 ++++++++----------- Project.toml | 36 +++++++- build/{create_binaries => }/README.md | 0 build/{create_binaries => }/build.jl | 9 +- build/create_binaries/Project.toml | 21 ----- build/create_binaries/src/create_app.jl | 32 -------- build/create_binaries/src/create_binaries.jl | 14 ---- build/create_binaries/src/create_lib.jl | 18 ---- build/libribasim/Project.toml | 17 ---- build/{create_binaries => }/precompile.jl | 4 +- build/ribasim_cli/Project.toml | 21 ----- build/ribasim_cli/README.md | 23 ------ build/ribasim_cli/src/ribasim_cli.jl | 7 -- .../{create_binaries => }/src/add_metadata.jl | 7 +- build/src/create_app.jl | 57 +++++++++++++ .../README.md => src/create_lib.jl} | 28 ++++++- build/{ribasim_cli => }/tests/test_models.py | 6 +- core/src/Ribasim.jl | 3 + {build/libribasim => core}/src/libribasim.jl | 2 +- core/src/main.jl | 4 + core/test/libribasim_test.jl | 4 - docs/src/docs.jl | 4 - pixi.toml | 8 +- python/ribasim_api/tests/conftest.py | 2 +- 34 files changed, 191 insertions(+), 253 deletions(-) rename build/{create_binaries => }/README.md (100%) rename build/{create_binaries => }/build.jl (69%) delete mode 100644 build/create_binaries/Project.toml delete mode 100644 build/create_binaries/src/create_app.jl delete mode 100644 build/create_binaries/src/create_binaries.jl delete mode 100644 build/create_binaries/src/create_lib.jl delete mode 100644 build/libribasim/Project.toml rename build/{create_binaries => }/precompile.jl (80%) delete mode 100644 build/ribasim_cli/Project.toml delete mode 100644 build/ribasim_cli/README.md delete mode 100644 build/ribasim_cli/src/ribasim_cli.jl rename build/{create_binaries => }/src/add_metadata.jl (94%) create mode 100644 build/src/create_app.jl rename build/{libribasim/README.md => src/create_lib.jl} (59%) rename build/{ribasim_cli => }/tests/test_models.py (83%) rename {build/libribasim => core}/src/libribasim.jl (99%) delete mode 100644 docs/src/docs.jl diff --git a/.github/workflows/core_compat_helper.yml b/.github/workflows/core_compat_helper.yml index 6db7c8918..c2e96be0f 100644 --- a/.github/workflows/core_compat_helper.yml +++ b/.github/workflows/core_compat_helper.yml @@ -38,11 +38,8 @@ jobs: run: | import CompatHelper CompatHelper.main(; subdirs=[ + ".", "core", - "docs", - "build/create_binaries", - "build/libribasim", - "build/ribasim_cli" ]) shell: julia --color=yes {0} env: diff --git a/.gitignore b/.gitignore index 56a0cdec8..7b5586e8c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,8 @@ docs/build/ docs/site/ /generated_testmodels -build/create_binaries/ribasim_cli/ -build/create_binaries/libribasim/ +build/ribasim_cli/ +build/libribasim/ JuliaSysimage.dll LocalPreferences.toml @@ -147,7 +147,7 @@ dmypy.json .pyre/ /.luarc.json -build/ribasim_cli/tests/temp/ +build/tests/temp/ python/ribasim_api/tests/temp/ report.xml /utils/juliaup diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml index f9dc835a2..f0595b117 100644 --- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml +++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml @@ -4,7 +4,7 @@ -