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.

Sign up for GitHub

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

Jump to bottom

Sync v24.1 and develop #3736

Closed
wants to merge 5 commits into from
Closed

Sync v24.1 and develop #3736

wants to merge 5 commits into from

Conversation

github-actions[bot]
Copy link
Contributor

Merge as soon as possible to avoid potential conflicts.

agriyakhetarpal and others added 5 commits January 16, 2024 19:49
@agriyakhetarpal @kratman @Saransh-cpp
Fix docs about Jax solver compatibility with Python versions (#3702)
89b9420 
* Ensure correct Python versions for Jax solver compatibility

* Simplify array of Python versions

Co-authored-by: Eric G. Kratz <[email protected]>

* Use different conjunction

Co-authored-by: Eric G. Kratz <[email protected]>

---------

Co-authored-by: Eric G. Kratz <[email protected]>
@agriyakhetarpal @Saransh-cpp
Merge pull request #3706 from agriyakhetarpal/fix-pybamm-install-odes
6ddd47e 
Make `pybamm_install_odes` a bit more robust
@rtimms @Saransh-cpp
#3690 fix issue with skipped steps (#3708)
f22f547 
* #3690 fix issue with skipped steps

* #3690 changelog

* #3690 add test
@rtimms @Saransh-cpp
#3611 use actual cell volume for average total heating (#3707)
adda336 
* #3611 use actual cell volume for average total heating

* #3611 changelog

* #3611 account for number of electrode pairs

* #3611 update variable names
@Saransh-cpp
Bump to v24.1rc1
1d920ee
@review-notebook-app Review Notebook App
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

Saransh-cpp commented Jan 16, 2024 •
edited
Loading

This is the automated PR.

The syncing part is supposed to update all the version strings in develop to v24.1rc1, but we will run into conflicts almost all the time in CHANGELOG, given that we're cherry-picking only the required commits to the release branch. In a way, develop and the release branches have diverged, and we cannot merge develop into v24.1 to fix the conflicts.

I think this will require updating the CHANGELOG in develop manually for non-rc0 releases. This will also save us from duplicating commits in develop. I think I will remove the step that syncs the develop and release branches whenever we create an rcX or a final release. Instead, we can create a PR that bumps the version strings and then asks us to manually sync the CHANGELOG before merging.

The release workflow - https://github.com/pybamm-team/PyBaMM/blob/develop/.github/release_workflow.md

cc: @kratman

@Saransh-cpp Saransh-cpp mentioned this pull request Jan 16, 2024
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Saransh-cpp @agriyakhetarpal @rtimms