Skip to content

Revert PR #687 merge - #690

Merged
jpalm3r merged 1 commit into
mainfrom
revert-687-merge
Aug 4, 2026
Merged

Revert PR #687 merge#690
jpalm3r merged 1 commit into
mainfrom
revert-687-merge

Conversation

@jpalm3r

Copy link
Copy Markdown
Collaborator

#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.

…ork constructors, with EPANET companion files"
This reverts commit 8651801, reversing
changes made to eb1cbc4.
CopilotAI lite review requested due to automatic review settings August 4, 2026 13:08

@ecomodellerecomodeller left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 .inp adapter 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
FileDescription
tests/testdata/README.mdRemoves fixture provenance documentation introduced with #687.
tests/testdata/epanet.inpRemoves EPANET companion input fixture.
tests/test_network.pyRemoves EPANET/MIKE 11/network-extension-policy tests and switches call sites to from_res1d().
tests/notebooks/test_notebooks.pyUpdates notebook skip rationale to reference Network.from_res1d().
src/modelskill/network.pySimplifies Network constructors to from_res1d() and removes multi-format/companion support logic.
src/modelskill/model/network.pyUpdates error messaging for Res1D constructor guidance.
src/modelskill/model/adapters/_res1d.pyRemoves MIKE 11/EPANET companion-related adapter logic.
src/modelskill/model/adapters/_inp.pyDeletes EPANET/SWMM .inp parser introduced with #687.
roadmap/features/network-models.mdUpdates roadmap claims to Res1D-only support.
notebooks/Collection_systems_network.ipynbUpdates example usage to Network.from_res1d().
docs/user-guide/network.qmdRemoves multi-product constructor docs and updates examples to Res1D-only usage.
adr/README.mdRemoves ADR-012 reference.
adr/012-network-format-constructors.mdDeletes ADR describing multi-product constructors.
.gitignoreRemoves ignore rule added for confidential testdata directory in #687 stack.
.github/workflows/full_test.ymlUpdates actions/checkout version as part of the revert.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment threadsrc/modelskill/network.py
Comment threadsrc/modelskill/model/network.py
Comment threaddocs/user-guide/network.qmd
@jpalm3r
jpalm3r merged commit a9f3ed2 into mainAug 4, 2026
15 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jpalm3r@ecomodeller