Skip to content

Commit

Permalink
Fix pre-commit CI and upgrade depdendencies (#116)
Browse files Browse the repository at this point in the history
The notebook diffs are from `nbstripout` which runs as part of
pre-commit. This should fix pre-commit CI.

This also directly upgrades ribasim from 2024.9 to 2024.10, as well as
all other dependencies in our lockfile.
  • Loading branch information
visr authored Jul 29, 2024
1 parent 7b85771 commit 3479218
Show file tree
Hide file tree
Showing 32 changed files with 7,396 additions and 6,874 deletions.
12,870 changes: 6,696 additions & 6,174 deletions pixi.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ bokeh_helpers = { path = "src/bokeh_helpers", editable = true }
# ribasim = { path = "../Ribasim/python/ribasim", editable = true }

[feature.prod.dependencies]
ribasim = "==2024.9.0"
ribasim = "==2024.10.0"

[environments]
default = { features = ["common", "prod"] }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "markdown",
"id": "924705f1-1daf-4219-88d9-21fab4b99cff",
"id": "0",
"metadata": {},
"source": [
"# Holandse Delta\n",
Expand All @@ -15,7 +15,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "1af9481d-973d-4984-ab7f-49c1aaf3360b",
"id": "1",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -34,7 +34,7 @@
},
{
"cell_type": "markdown",
"id": "bafc03b1-cdd1-422b-bdba-009e9722b6b1",
"id": "2",
"metadata": {},
"source": [
"### Load Data"
Expand All @@ -43,7 +43,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "b0803592-1a07-461d-9432-937520958dbb",
"id": "3",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -61,7 +61,7 @@
},
{
"cell_type": "markdown",
"id": "51000003-77ac-4227-8d51-3845b7755d22",
"id": "4",
"metadata": {},
"source": [
"### Select rhws"
Expand All @@ -70,7 +70,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "d09e1f8b-6c3b-473b-92ef-79f81973960e",
"id": "5",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -86,7 +86,7 @@
},
{
"cell_type": "markdown",
"id": "7bd2d0fe-6649-4368-8a83-c1e177fc34f7",
"id": "6",
"metadata": {},
"source": [
"### Define functions\n",
Expand All @@ -98,7 +98,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "653be271-3e5d-4d57-a8eb-65bc8b128e9e",
"id": "7",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -253,7 +253,7 @@
},
{
"cell_type": "markdown",
"id": "63cb73d3-eea9-4a88-804a-ac35671bf75f",
"id": "8",
"metadata": {},
"source": [
"# Shortest Path"
Expand All @@ -262,7 +262,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "c2bb462c-de8e-4bb7-8cb9-0b0fa4a78744",
"id": "9",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -520,15 +520,15 @@
{
"cell_type": "code",
"execution_count": null,
"id": "4d791aa6-f02a-4f02-98f3-8ee58081113c",
"id": "10",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "f3ce7fec-3924-4d0a-be2b-0c9dea364bce",
"id": "11",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -538,23 +538,23 @@
{
"cell_type": "code",
"execution_count": null,
"id": "57b2d1c7-5732-46b6-bdc1-9129c638d11d",
"id": "12",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "16f8245b-a13d-4ee0-bafd-4415215756a1",
"id": "13",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "140144ed-d4ad-40fb-a23c-54245c5d5e33",
"id": "14",
"metadata": {},
"outputs": [],
"source": []
Expand Down
44 changes: 22 additions & 22 deletions src/peilbeheerst_model/Shortest_path/02_shortest_path_HHSK.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "markdown",
"id": "924705f1-1daf-4219-88d9-21fab4b99cff",
"id": "0",
"metadata": {},
"source": [
"# HHSK\n",
Expand All @@ -15,7 +15,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "1af9481d-973d-4984-ab7f-49c1aaf3360b",
"id": "1",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -34,7 +34,7 @@
},
{
"cell_type": "markdown",
"id": "bafc03b1-cdd1-422b-bdba-009e9722b6b1",
"id": "2",
"metadata": {},
"source": [
"### Load Data"
Expand All @@ -43,7 +43,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "b0803592-1a07-461d-9432-937520958dbb",
"id": "3",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -61,7 +61,7 @@
},
{
"cell_type": "markdown",
"id": "51000003-77ac-4227-8d51-3845b7755d22",
"id": "4",
"metadata": {},
"source": [
"### Select rhws"
Expand All @@ -70,7 +70,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "d09e1f8b-6c3b-473b-92ef-79f81973960e",
"id": "5",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -86,7 +86,7 @@
},
{
"cell_type": "markdown",
"id": "7bd2d0fe-6649-4368-8a83-c1e177fc34f7",
"id": "6",
"metadata": {},
"source": [
"### Define functions\n",
Expand All @@ -98,7 +98,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "653be271-3e5d-4d57-a8eb-65bc8b128e9e",
"id": "7",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -253,7 +253,7 @@
},
{
"cell_type": "markdown",
"id": "63cb73d3-eea9-4a88-804a-ac35671bf75f",
"id": "8",
"metadata": {},
"source": [
"# Shortest Path"
Expand All @@ -262,7 +262,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "59146188-1742-4af0-bcfc-b7728c6d545a",
"id": "9",
"metadata": {
"tags": []
},
Expand Down Expand Up @@ -522,95 +522,95 @@
{
"cell_type": "code",
"execution_count": null,
"id": "d58fac6e-e857-477e-980d-4280a4c6474e",
"id": "10",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "95bb5a73-5423-43c8-b574-47ff3f579a32",
"id": "11",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "745bee38-d8c5-48f8-9c3a-c3b312705e40",
"id": "12",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "2f6739ca-446b-4f66-9601-bd11d4c49b66",
"id": "13",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "3f9adeef-1375-49a1-8187-748919c7f0ab",
"id": "14",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "9c4bee1d-124a-4c98-9ac2-1a486792ebc3",
"id": "15",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "fc11f212-7b6e-40a9-a575-0ca54166fb6a",
"id": "16",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "d0e8711a-402d-43dc-85f3-284398a293be",
"id": "17",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "541d0851-3c4f-49af-8674-a06e8e7411ca",
"id": "18",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "ffe1f5f9-2152-4989-876f-d79c8940cc5c",
"id": "19",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "21acb4e0-04c8-4aed-9e69-80563fa8b8d3",
"id": "20",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "9f9dd3b5-37b5-4aa8-8e1a-c4d0ba515196",
"id": "21",
"metadata": {},
"outputs": [],
"source": []
Expand Down
Loading

0 comments on commit 3479218

Please sign in to comment.