-
-
Notifications
You must be signed in to change notification settings - Fork 517
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
Release v24.5rc2 #4259
Release v24.5rc2 #4259
Conversation
* Update test pypi * Style fix
* Make function for handling time or reuse an existing one Fixes #4113 * style: pre-commit fixes * fixing raises RegEx Error Experiment Test * fix pre-commit error * Update pybamm/callbacks.py Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Co-authored-by: Valentin Sulzer <valentinsulzer@hotmail.com> Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com>
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
I think this PR can be closed. Something went wrong with the GitHub steps and we should not go directly from rc0 to rc2 in git history for the develop branch. |
@Saransh-cpp other way around. I made the rc1 release with a mistake, yanked it, and then made rc2 |
When v24.5 was merged into develop, all of develop was merged into that branch. This one is cherry picked directly on top of the rc0 tag. The mistake in RC1 was that I created it with the v24.5 branch, which was not the same as rc0. Once rc2 was tested, I was going to fix the v24.5 branch to make it match |
Yes, I went through the branches and releases. The three branches have started diverging, which is causing conflicts. We yanked the Merging the rc1 changes into develop first and then the rc2 ones would make all the conflicts/branch divergences go away. |
@Saransh-cpp, @brosaplanella, @agriyakhetarpal I am going to sync this with develop so it can be merged. Then I will delete the branch after. The v24.5 branch will be updated to the v24.5rc2 tag |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you'll have to rebase and resolve the conflicts.
Edit: Sorry! Just saw your comment above.
@Saransh-cpp I know. I was waiting to hear back about any issues with the rc before syncing this branch. I am going to sync and merge this later today |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #4259 +/- ##
========================================
Coverage 99.45% 99.45%
========================================
Files 288 288
Lines 22086 22086
========================================
Hits 21966 21966
Misses 120 120 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for working on this, @kratman!
Description
Release branch for RC1