Merge main into loopdemo#147
Merged
juliusmittler merged 37 commits intojulius_loop_demofrom Apr 23, 2026
Merged
Conversation
Changes from Shankha Nag
Move notebooks to notebooks folder
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Add a gitignore file
Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
Add pyiron.log to ignore
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>
Update build
Update binder config
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>
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>
Minimal demo
Include python 3.14
# Conflicts: # .gitignore # notebooks/demo.ipynb # notebooks/pyironflow_demo.ipynb # notebooks/workflow_multiscale_linear_elasticity_gui.ipynb # presentations/multiscale_example_pyiron-xyflow.pptx
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
Member
Author
|
notebook failure: I went to look at the signature for |
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.
@juliusmittler, the logs launching binder right on
julius_loop_democomplained 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 oldsetuptoolsbuild system and the newhatchlingbuild system. I patched all these back in January 27 onmain, but I guess that's just not merged into your branch.Here, I checked a new branch off
julius_loop_demoand mergedmain. There were conflicts for the .gitignore, the pptx in the docs, and all the notebooks (I bet they've just been re-executed). I acceptedmainuniformly 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_guidev branch. As long as the conflicts there are also all documentation-related, it should be similarly safe to accept themainversion of each conflict file. You might want to be more intelligent about merging.gitignorein case you added meaningful things to it on your branch.