Update changelog and CITATION.cff for v26.6.2.0#5618
Merged
Conversation
This was referenced Jun 16, 2026
Closed
BradyPlanden
force-pushed
the
update-changelog-v26.6.2.0
branch
from
d08df6c to
212e9ca
Compare
…eaking note (#5469) to v26.5.0
BradyPlanden
force-pushed
the
update-changelog-v26.6.2.0
branch
from
212e9ca to
a43b51c
Compare
MarcBerliner
approved these changes
Jun 16, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #5618 +/- ##
==========================================
- Coverage 98.10% 98.10% -0.01%
==========================================
Files 339 339
Lines 31779 31817 +38
==========================================
+ Hits 31178 31213 +35
- Misses 601 604 +3 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
BradyPlanden
added a commit
that referenced
this pull request
Jun 16, 2026
…monorepo-merge Brings in 9 commits from origin/main since the last sync (0b3f7b2..ae2e620): - #5616 BPX State "Initial state-of-charge" now applied (was ignored) - #5604 "Contact resistance [Ohm]" can be a function of temperature - #5610/#5612 fix incomplete BPX import for interpolated-table OCP branches - #5609 preserve custom-model discretisation recipe across serialise/load - #5613 linkcheck/lychee ignores for bot-blocked URLs - #5611 add agent-guidance files (AGENTS.md + symlinks) - #5614/#5615 security bumps (bleach 6.4.0, starlette 1.3.1, tornado 6.5.7) - #5618 v26.6.2.0 release (changelog + CITATION.cff) Resolution notes: - Merge auto-resolved with zero textual conflicts; rename detection mapped all src/* -> packages/pybamm/src/* , tests/* -> packages/pybamm/tests/* and CITATION.cff -> packages/pybamm/CITATION.cff. Each relocated file verified byte-identical to origin/main. - CHANGELOG.md: the auto-merge buried the unreleased monorepo #5512 "Features" entry inside the shipped [v26.6.2.0] block. Moved it back under [Unreleased]; the file now equals origin/main plus only that one preserved entry. - docs/conf.py and uv.lock are true 3-way unions: main's edits (linkcheck ignores; bleach/starlette/tornado bumps) combined with the monorepo's changes (bibtex path; workspace lock structure intact). - New agent files (AGENTS.md and the CLAUDE.md/GEMINI.md/QWEN.md/.cursorrules/ copilot-instructions symlinks) added at the repo root, symlinks preserved. NOTE: their content describes the pre-monorepo src/ and tests/ layout and will need reconciling to packages/pybamm/* as a follow-up.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog update on
mainfor the v26.6.2.0 feature release (release PR #5617).Moves the released entries out of
# [Unreleased]into a dated# [v26.6.2.0]block (byte-identical to the block on the release tag), and bumpsCITATION.cffto26.6.2.0.The released block contains the features #5616 (BPX
Initial state-of-charge) and #5604 (temperature-dependent contact resistance), plus bug fixes #5610, #5600, #5599, and #5609 (the last previously shipped tomainwithout a changelog entry, added here).# [Unreleased]now keeps only the "voltage as a state" default flip (#5573), which targets a future feature release.Also corrects a misfiled entry: the
bpx0.5.0 to 1.1.0 breaking note (#5469/#5571) was added to[Unreleased]by #5616, but that upgrade shipped in v26.5.0. It is relocated to the v26.5.0 release block, where the pin actually changed.Per RELEASE.md, the release is tagged from
release/v26.6.2.0(not by merging that branch), so this separate PR keepsmain's changelog in sync without duplicating commits.Merge after
v26.6.2.0is tagged and published.Supersedes the stale changelog PR #5606 (for the abandoned v26.6.1.2 patch), which should be closed.
🤖 Generated with Claude Code