-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix data save issue for non-square patterns #486
Conversation
Thanks! The failing test is due to #484, I'll include a fix for this in this PR, hope that's OK. I'll also add a test for saving and loading non-square patterns. Could you point this to main instead of develop? This should be released right away, and so should go to main. |
Thought I have selected main. Just corrected it. Thank you. |
Ah, we don't want all these extra commits. Can you either (1) rebase your commit on the latest commit in main or (2) branch out from the latest commit on main and do the change there? |
Sorry for that. Just realise what happened after some reading. I hope this has been fixed now. |
Seems to have done the trick! Did you rebase and then force push? I've used git for a while, but am no expert, so I'm curious. |
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
I'll merge after checks pass. FYI: This merge contains a commit with a change in the release version (0.5.4 -> 0.5.5), so a tagged release draft will be automatically made (script run from GitHub Action). I'll touch up the draft if necessary (most likely not), and then publish. This publishing will trigger this action which will build the source distribution and upload it to PyPI! Easy peasy. |
Yes, I rebased and pushed the normal way, and got rejected. Luckily, There is a stackoverflow post about this, so I tried force push. Looks like it works. I also tried created a new branch from main and made the change. But I'm not sure if I create a PR from the new branch, it would duplicate the current PR.
Very cool. Thanks for the info. I'll take a read to see how it works. |
No problem creating a new PR and closing this one, the important thing is the git history, not the GitHub "history" with open/closed PRs, issues etc. In this case I would have (1) pulled the last changes in main locally, (2) branched off of main, (3) done the change, (4) make PR.
Sure, I think it is very cool indeed (: Two branches are more complicated than one branch, but having this and automation makes it a lot simpler to release patch releases in my opinion. |
This is quick patch for fixing data save issue mentioned in #485
Tested on h5ebsd file saved from Oxford .ebsp data file. The saved pattern dimensions are consistent with original patterns.