Skip to content

Merge main into loopdemo#147

Merged
juliusmittler merged 37 commits intojulius_loop_demofrom
merge-main-into-loopdemo
Apr 23, 2026
Merged

Merge main into loopdemo#147
juliusmittler merged 37 commits intojulius_loop_demofrom
merge-main-into-loopdemo

Conversation

@liamhuber
Copy link
Copy Markdown
Member

@juliusmittler, the logs launching binder right on julius_loop_demo complained about configuration of the hatching build system's versioning tool. When I peek at this branch (and your working branch), I see it still mixes-and-matches the old setuptools build system and the new hatchling build system. I patched all these back in January 27 on main, but I guess that's just not merged into your branch.

Here, I checked a new branch off julius_loop_demo and merged main. There were conflicts for the .gitignore, the pptx in the docs, and all the notebooks (I bet they've just been re-executed). I accepted main uniformly here. This merge didn't hurt any of your work and we get all your nice changes to the underlying source code and the demo is showing up fine. I can launch it directly from this binder link and it looks like it's working to me:

https://mybinder.org/v2/gh/pyiron/pyironflow/merge-main-into-loopdemo?urlpath=%2Fdoc%2Ftree%2Floop_demo.ipynb

If this all looks good and works well for you, I expect it's also trivially straightforward and helpful to merge main into your main julius_gui dev branch. As long as the conflicts there are also all documentation-related, it should be similarly safe to accept the main version of each conflict file. You might want to be more intelligent about merging .gitignore in case you added meaningful things to it on your branch.

jan-janssen and others added 30 commits November 13, 2025 05:45
Move notebooks to notebooks folder
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
For formatting and metadata

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
With centralized, hatch-based version

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
So the package files are available for anyone building it this route

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
To not conflict with the merged file in the centralized CI

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
But turn off everything except the env update. My hope and expectation is that this will auto-populate the binder env file. We can slowly turn on other components as the repo can handle them.

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
To match the pyproject

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
with the main gui class

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
The "root_path" for the node library has `"pyiron_nodes"` hard-coded in it, and suffers from conflicting purposes #47 (comment)

So for now, just leave it empty and have no node library. It sucks, but it is the least of evils.

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Other demos have complex dependencies and/or are outdated

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
liamhuber and others added 7 commits January 27, 2026 13:37
Exclude all the others, since they will fail at least for reasons of unavailable dependencies.

Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
# Conflicts:
#	.gitignore
#	notebooks/demo.ipynb
#	notebooks/pyironflow_demo.ipynb
#	notebooks/workflow_multiscale_linear_elasticity_gui.ipynb
#	presentations/multiscale_example_pyiron-xyflow.pptx
@review-notebook-app
Copy link
Copy Markdown

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@liamhuber
Copy link
Copy Markdown
Member Author

notebook failure:

File [/srv/conda/envs/notebook/lib/python3.13/site-packages/pyironflow/reactflow.py:336](https://hub.gesis.mybinder.org/srv/conda/envs/notebook/lib/python3.13/site-packages/pyironflow/reactflow.py#line=335), in PyironFlowWidget.update(self)
    334 def update(self):
--> 336     nodes = get_nodes(self.wf, self.gui.expanded_macros)
    337     edges = get_edges(self.wf, self.gui.expanded_macros)
    339     self.gui.nodes = json.dumps(nodes)

TypeError: get_nodes() missing 1 required positional argument: 'buildExpand'

I went to look at the signature for get_nodes and I see you modified it with an extra parameter. I haven't looked into the how and why, but I have no intrinsic objection to that. This is the sort of test failure we need to get resolved before merging your branch into main, but not before merging main into your branch -- as long as the demo notebook is behaving as you want, I think it's ok to merge this into your demo branch.

@juliusmittler juliusmittler merged commit 10048f7 into julius_loop_demo Apr 23, 2026
12 of 13 checks passed
@juliusmittler juliusmittler deleted the merge-main-into-loopdemo branch April 23, 2026 05:52
Sign up for free to 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.

5 participants