Skip to content

cumulative changes by Julius Mittler #136

Draft
juliusmittler wants to merge 34 commits intomainfrom
julius_gui
Draft

cumulative changes by Julius Mittler #136
juliusmittler wants to merge 34 commits intomainfrom
julius_gui

Conversation

@juliusmittler
Copy link
Contributor

All changes done by Julius Mittler since October 2024

includes:

  • custom macro creation
  • sub workflows from mulit-selection
  • macro node expansion
  • auto sorting of expanded nodes

added custom_macro creation for a selection of nodes and edges
added custom_macro creation for a selection of nodes and edges
for development only
added ghostNodes and size dependant layout
update
update
startet modifying for macro sub nodes
added macro nodes, macro sub nodes
and basic sorting
intermitten update
demo for in/out nodes for macros
update
made in/output nodes adaptable to macros
updated node_selection
added temp_sub_node_list for saving subnode positions
added autosorting macros on expansion
some slight cleanup on the gui and log messages
This reverts commit 3dc8018.
removed test buttons
arranged sorting functionality
removed some log messages
slight log message cleanup
created basic node type MacroInOutNodes
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@liamhuber
Copy link
Member

@juliusmittler, I'll be doing some infrastructure work in this repo this week. I've taken a look at the pending files here, and I think the only place we're likely to wind up with a git conflict is in the gitignore itself; the one I just merged to main is a superset of the one you have here, so you should be able to safely take the one on main.

On that note, there's a bunch of files here (e.g. *.pyc and windows files) that we don't want in the repo. When you get the time, would you please remove them? I don't have the operations memorized, but Claude's recommendation looks good to me:

git rm --cached $(git ls-files -i --exclude-standard)
git commit -m "Remove files now in .gitignore"
git push

Now, that still leaves the files in the git history. Getting rid of that explicitly would require git filter-branch and force-pushing. These files aren't a security risk, just data crud, so that seems like more work than it's worth. Instead, we could simply squash-merge this PR when the time comes, and the main history won't ever see these files that were added then removed on this branch alone.

@liamhuber
Copy link
Member

@juliusmittler, I don't know if I'm familiar enough yet with the repo to offer a very in-depth review, but the first thing to do is git-remove all the extra stuff currently in the main branch's gitignore. You might need to force-push to get those files un-tracked here. Next is to merge in main -- probably by uniformly accepting main's demo.ipynb; for .gitignore you may want to do a real merge and keep some of the stuff you added, idk.

Once the PR is trimmed down to "real" files, please ping me and I'll come give what review I can.

added simple loop creation/visualisation
removed unwanted files
added multiple node and edge types to support loops
removed jupyter notebooks
removed pyiron_nodes and updated gitignore
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.

2 participants