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

Sync develop with v24.5 #4295

Merged
merged 43 commits into from
Jul 27, 2024
Merged

Sync develop with v24.5 #4295

merged 43 commits into from
Jul 27, 2024

Conversation

kratman
Copy link
Contributor

@kratman kratman commented Jul 26, 2024

Description

Sync branch to merge main (v24.5) into develop. This should be merged, not squashed.

brosaplanella and others added 30 commits February 28, 2023 20:17
…-support

Drop support for i686 manylinux
Improve release workflow, add a note, bump version manually
Build wheels on the 1st and 15th of every month
make initial soc work with half cell models
JaxSolver fails when using GPU support with no input parameters
Resolve default imports for optional dependencies
* Ensure correct Python versions for Jax solver compatibility

* Simplify array of Python versions

Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com>

* Use different conjunction

Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com>

---------

Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com>
Make `pybamm_install_odes` a bit more robust
* #3690 fix issue with skipped steps

* #3690 changelog

* #3690 add test
* #3611 use actual cell volume for average total heating

* #3611 changelog

* #3611 account for number of electrode pairs

* #3611 update variable names
* Try fixing the release workflow

* Turn off safety

* Fix CHANGELOG

* Add OS

* Use regex for better matches

* Update instructions, add safety checks

* checkout to the version branch for the final release
* #3630 fix interpolant shape error

* #3630 changelog
agriyakhetarpal and others added 9 commits January 30, 2024 19:53
…nner (#3785)

* Try fixing M-series runner tests

This is being done by adding SuiteSparse and SUNDIALS installations which might have been missing on the runner, which broke `scikits.odes`.

* Don't use Homebrew SUNDIALS, use LD_LIBRARY_PATH

* Don't use Homebrew to install SUNDIALS

* Force remove pip cache for `scikits.odes`

---------

Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com>
* fix: error catch for electrode diffusivity

* refactor: update diffusivity error catch and test

* tests: up coverage for diffusivity name catches

* Update pybamm/util.py

Co-authored-by: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>

---------

Co-authored-by: Eric G. Kratz <kratman@users.noreply.github.com>
Co-authored-by: Ferran Brosa Planella <Ferran.Brosa-Planella@warwick.ac.uk>
Co-authored-by: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
@kratman kratman marked this pull request as ready for review July 26, 2024 18:20
@kratman
Copy link
Contributor Author

kratman commented Jul 26, 2024

@agriyakhetarpal, @Saransh-cpp The change log stuff in this PR were mistakes I found while creating v24.5 earlier this week. Basically older PRs had some changelog updates that got merged into the 24.1 section instead of the unreleased section

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link

codecov bot commented Jul 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.45%. Comparing base (91c9744) to head (43b3ca9).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #4295   +/-   ##
========================================
  Coverage    99.45%   99.45%           
========================================
  Files          288      288           
  Lines        22092    22092           
========================================
  Hits         21972    21972           
  Misses         120      120           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kratman
Copy link
Contributor Author

kratman commented Jul 26, 2024

@prady0t Link failures caused by #4180

Copy link
Member

@agriyakhetarpal agriyakhetarpal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please feel free to merge once the link failure is resolved. @prady0t, once this PR gets merged, could you please rebase #4205? We'll get that merged next before any other regular development resumes

@prady0t
Copy link
Contributor

prady0t commented Jul 27, 2024

Sure! How can I fix link failures here?

@agriyakhetarpal
Copy link
Member

Sure! How can I fix link failures here?

You may open a new PR to develop, and we can then sync this branch with it to bring the changes here. The link to the link failures summary is here: https://github.com/pybamm-team/PyBaMM/actions/runs/10116553020/attempts/1#summary-27979621346

@kratman
Copy link
Contributor Author

kratman commented Jul 27, 2024

@agriyakhetarpal, @prady0t this branch did not cause the failures, so we can merge this one. The release was already created, I only mentioned the failures here because the other PR was merged before this one

@kratman kratman merged commit 033c6a6 into develop Jul 27, 2024
25 of 26 checks passed
@kratman kratman deleted the chore/sync24.5 branch July 27, 2024 13:49
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.

9 participants