Skip to content
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

Merged
merged 11 commits into from
Jul 18, 2024
Merged

Release v24.5rc2 #4259

merged 11 commits into from
Jul 18, 2024

Conversation

kratman
Copy link
Contributor

@kratman kratman commented Jul 12, 2024

Description

Release branch for RC1

  • Pre-release created
  • Release tested
  • Ready to merge

Saransh-cpp and others added 10 commits May 1, 2024 10:10
* 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>
* make longer default duration and calculate it for C-rate

* add tests

* typo

* #4224 add warning for time termination and add abs

* fix tests

* #4224 keep non-C-rate default at 24h for performance reasons

* trying to fix experiment

* fix example

* #4224 eric comments

* fix bug
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@Saransh-cpp
Copy link
Member

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.

@kratman
Copy link
Contributor Author

kratman commented Jul 13, 2024

@Saransh-cpp other way around. I made the rc1 release with a mistake, yanked it, and then made rc2

@kratman
Copy link
Contributor Author

kratman commented Jul 13, 2024

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

@Saransh-cpp
Copy link
Member

Yes, I went through the branches and releases. The three branches have started diverging, which is causing conflicts. We yanked the rc1 release but I think it should still be present in the git history, given that we did make a release (and it is on our GitHub as well). The additional conflicts from this branch are also an issue.

Merging the rc1 changes into develop first and then the rc2 ones would make all the conflicts/branch divergences go away.

@kratman kratman mentioned this pull request Jul 17, 2024
8 tasks
@kratman kratman marked this pull request as ready for review July 17, 2024 13:38
@kratman
Copy link
Contributor Author

kratman commented Jul 17, 2024

@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

Copy link
Member

@Saransh-cpp Saransh-cpp left a 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.

@kratman
Copy link
Contributor Author

kratman commented Jul 17, 2024

@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

@kratman kratman requested a review from Saransh-cpp July 17, 2024 14:08
Copy link

codecov bot commented Jul 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.45%. Comparing base (9afe45e) to head (fe39f99).

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.
📢 Have feedback on the report? Share it here.

Copy link
Member

@Saransh-cpp Saransh-cpp left a 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!

@kratman kratman merged commit 740fa50 into develop Jul 18, 2024
26 checks passed
@kratman kratman deleted the v24.5rc2 branch July 18, 2024 12:20
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.

None yet

5 participants