From ce049e597721b92f446b3277d9a3e1d0456cee55 Mon Sep 17 00:00:00 2001 From: jpalm3r Date: Tue, 2 Jun 2026 10:39:35 +0200 Subject: [PATCH 1/4] pinning mikeio1d --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fbd9f99fa..c96c9ba13 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ version = "1.4.0a3" dependencies = [ "numpy > 1.24.4", "pandas >= 1.4, < 3.0", # TODO remove upper limit - "mikeio >= 1.2", + "mikeio == 1.2.1", "matplotlib", "xarray", "netCDF4", From 2f69737bf1a75d66c3587403e6c4ddb35a645473 Mon Sep 17 00:00:00 2001 From: jpalm3r Date: Tue, 2 Jun 2026 10:48:30 +0200 Subject: [PATCH 2/4] Fixing wrong pin --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c96c9ba13..940c5af35 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ version = "1.4.0a3" dependencies = [ "numpy > 1.24.4", "pandas >= 1.4, < 3.0", # TODO remove upper limit - "mikeio == 1.2.1", + "mikeio >= 1.2", "matplotlib", "xarray", "netCDF4", @@ -62,7 +62,7 @@ test = [ notebooks = ["nbformat", "nbconvert", "jupyter", "plotly", "shapely", "seaborn"] -networks = ["mikeio1d", "networkx"] +networks = ["mikeio1d==1.2.1", "networkx"] [project.urls] "Homepage" = "https://github.com/DHI/modelskill" From 82eb72770f4b4f6205cfd7f31399fc7a813afbab Mon Sep 17 00:00:00 2001 From: jpalm3r Date: Tue, 2 Jun 2026 10:50:45 +0200 Subject: [PATCH 3/4] Include (again) test network in full test workflow --- .github/workflows/full_test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/full_test.yml b/.github/workflows/full_test.yml index a35ffc4a0..408e38442 100644 --- a/.github/workflows/full_test.yml +++ b/.github/workflows/full_test.yml @@ -35,9 +35,7 @@ jobs: enable-cache: true - name: Install dependencies - # (Reactivate once it works with mikeio1d) - #run: uv sync --group test --group networks --no-dev - run: uv sync --group test --no-dev + run: uv sync --group test --group networks --no-dev - name: Install pandas 2.x if: matrix.pandas-version == 'pandas2' From 5f1ee84f8765faab98cff2c19947b8a3da07d721 Mon Sep 17 00:00:00 2001 From: jpalm3r Date: Tue, 2 Jun 2026 10:53:23 +0200 Subject: [PATCH 4/4] Include (again) build with no networks --- .github/workflows/full_test.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/full_test.yml b/.github/workflows/full_test.yml index 408e38442..26157917a 100644 --- a/.github/workflows/full_test.yml +++ b/.github/workflows/full_test.yml @@ -54,23 +54,22 @@ jobs: - name: Test run: just test - # TODO: activate once above runs with -- group networks - # build-no-networks: - # runs-on: ubuntu-latest + build-no-networks: + runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 + steps: + - uses: actions/checkout@v4 - # - uses: extractions/setup-just@v3 + - uses: extractions/setup-just@v3 - # - name: Set up uv - # uses: astral-sh/setup-uv@v6 - # with: - # python-version: "3.11" - # enable-cache: true + - name: Set up uv + uses: astral-sh/setup-uv@v6 + with: + python-version: "3.11" + enable-cache: true - # - name: Install dependencies (without networks) - # run: uv sync --group test --no-dev + - name: Install dependencies (without networks) + run: uv sync --group test --no-dev - # - name: Test - # run: just test \ No newline at end of file + - name: Test + run: just test \ No newline at end of file