Revert PR #687 merge - #690
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts the previously merged PR #687 so main returns to its pre-#687 behavior, primarily by removing the expanded multi-product network constructors/adapters and restoring a simpler Res1D-only network loading path.
Changes:
- Removes EPANET/MIKE 11-specific network constructor logic and companion-file parsing (including deletion of the
.inpadapter and related fixtures/ADR). - Updates docs, notebooks, tests, and roadmap text to reflect
Network.from_res1d()and Res1D-only support. - Adjusts CI workflow checkout action version as part of the revert.
Reviewed changes
Copilot reviewed 14 out of 19 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/testdata/README.md | Removes fixture provenance documentation introduced with #687. |
| tests/testdata/epanet.inp | Removes EPANET companion input fixture. |
| tests/test_network.py | Removes EPANET/MIKE 11/network-extension-policy tests and switches call sites to from_res1d(). |
| tests/notebooks/test_notebooks.py | Updates notebook skip rationale to reference Network.from_res1d(). |
| src/modelskill/network.py | Simplifies Network constructors to from_res1d() and removes multi-format/companion support logic. |
| src/modelskill/model/network.py | Updates error messaging for Res1D constructor guidance. |
| src/modelskill/model/adapters/_res1d.py | Removes MIKE 11/EPANET companion-related adapter logic. |
| src/modelskill/model/adapters/_inp.py | Deletes EPANET/SWMM .inp parser introduced with #687. |
| roadmap/features/network-models.md | Updates roadmap claims to Res1D-only support. |
| notebooks/Collection_systems_network.ipynb | Updates example usage to Network.from_res1d(). |
| docs/user-guide/network.qmd | Removes multi-product constructor docs and updates examples to Res1D-only usage. |
| adr/README.md | Removes ADR-012 reference. |
| adr/012-network-format-constructors.md | Deletes ADR describing multi-product constructors. |
| .gitignore | Removes ignore rule added for confidential testdata directory in #687 stack. |
| .github/workflows/full_test.yml | Updates actions/checkout version as part of the revert. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#687 was merged prematurely, before the follow-up rebases of #681 and #685 onto it were confirmed ready to land. This reverts that merge so main returns to its pre-#687 state; #687 will be re-merged once the full stack is ready.
Reverts commit 8651801.