Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overhaul of Python architecture #731

Merged
merged 22 commits into from
Nov 14, 2023
+2,742 −2,951
Merged

Overhaul of Python architecture #731

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d736371
get pydantic v2
visr Oct 16, 2023
ec23146
add default None to Optional node types for pydantic v2
visr Oct 17, 2023
e2a8e3e
run bump-pydantic
visr Oct 17, 2023
135be97
update addnode example
visr Oct 17, 2023
d07e9ad
fix deprecation warning
visr Oct 17, 2023
ce4b332
Add dependency on testmodel for build binary tasks (#672)
Hofer-Julian Oct 17, 2023
50cf27f
datamodel-codegen pydantic v2 output
visr Oct 17, 2023
2d2d439
Merge main.
evetion Oct 26, 2023
6d70886
Reading writing works.
evetion Nov 2, 2023
e2510be
Merged main.
evetion Nov 2, 2023
6f088dd
Apply suggestions from code review
evetion Nov 3, 2023
507d925
Enforce new language syntax with pyupgrade rule
Hofer-Julian Nov 3, 2023
d4eadb5
Fix sorting. Deleted node_types.
evetion Nov 3, 2023
6b1d5fb
Fix all testmodels.
evetion Nov 7, 2023
bd34248
Fixed mypy and toml files.
evetion Nov 13, 2023
ac3a45e
Merged main.
evetion Nov 13, 2023
a50e453
Add pydantic v2.
evetion Nov 13, 2023
77270f6
Fix examples notebook.
evetion Nov 13, 2023
b9b2120
Final mypy error.
evetion Nov 13, 2023
be766f9
Stop parameterizing Edge
Hofer-Julian Nov 14, 2023
124159b
Make Node and Edge less generic.
evetion Nov 14, 2023
24bd84e
Fix allocation_network_id.
evetion Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/contribute/addnode.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ from typing import Optional
import pandera as pa
from pandera.engines.pandas_engine import PydanticModel
from pandera.typing import DataFrame
from pydantic import ConfigDict

from ribasim import models
from ribasim.input_base import TableModel
Expand Down Expand Up @@ -145,8 +146,7 @@ class NewNodeType(TableModel):
static: Optional[DataFrame[StaticSchema]] = None
# possible other schemas

class Config:
validate_assignment = True
model_config = ConfigDict(validate_assignment=True)

def sort(self):
self.static.sort_values("node_id", ignore_index=True, inplace=True)
Expand Down
Loading