Skip to content

Commit f41be98

Browse files
Merge branch 'develop' into bump-jax-jaxlib-versions
2 parents ae9a637 + 32fad00 commit f41be98

File tree

118 files changed

+4161
-565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+4161
-565
lines changed

.all-contributorsrc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,34 @@
727727
"code",
728728
"test"
729729
]
730+
},
731+
{
732+
"login": "chmabaur",
733+
"name": "chmabaur",
734+
"avatar_url": "https://avatars.githubusercontent.com/u/127507466?v=4",
735+
"profile": "https://github.com/chmabaur",
736+
"contributions": [
737+
"bug",
738+
"code"
739+
]
740+
},
741+
{
742+
"login": "AbhishekChaudharii",
743+
"name": "Abhishek Chaudhari",
744+
"avatar_url": "https://avatars.githubusercontent.com/u/91185083?v=4",
745+
"profile": "https://github.com/AbhishekChaudharii",
746+
"contributions": [
747+
"doc"
748+
]
749+
},
750+
{
751+
"login": "shubhambhar007",
752+
"name": "Shubham Bhardwaj",
753+
"avatar_url": "https://avatars.githubusercontent.com/u/32607282?v=4",
754+
"profile": "https://github.com/shubhambhar007",
755+
"contributions": [
756+
"infra"
757+
]
730758
}
731759
],
732760
"contributorsPerLine": 7,

.coveragerc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
a63e49ece0f9336d1f5c2562f7459e555c6e6693
55
# activated standard pre-commits - https://github.com/pybamm-team/PyBaMM/pull/3192
66
5273214b585c5a4286609aed40e0b092d0e05f42
7+
# migrate config to pyproject.toml - https://github.com/pybamm-team/PyBaMM/pull/3557
8+
12c5d77203bd93542785d237bac00bad5ed5469a

.github/release_workflow.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ This file contains the workflow required to make a `PyBaMM` release on GitHub, P
1111
- `CITATION.cff`
1212
- `pyproject.toml`
1313
- `vcpkg.json`
14-
- `docs/_static/versions.json`
1514
- `CHANGELOG.md`
1615

1716
These changes will be automatically pushed to a new branch `vYY.MM` and a PR from `vvYY.MM` to `develop` will be created (to sync the branches).
@@ -35,7 +34,6 @@ If a new release candidate is required after the release of `rc0` -
3534
- `CITATION.cff`
3635
- `pyproject.toml`
3736
- `vcpkg.json`
38-
- `docs/_static/versions.json`
3937
- `CHANGELOG.md`
4038

4139
These changes will be automatically pushed to the existing `vYY.MM` branch and a PR from `vvYY.MM` to `develop` will be created (to sync the branches).
@@ -57,7 +55,6 @@ Once satisfied with the release candidates -
5755
- `CITATION.cff`
5856
- `pyproject.toml`
5957
- `vcpkg.json`
60-
- `docs/_static/versions.json`
6158
- `CHANGELOG.md`
6259

6360
These changes will be automatically pushed to the existing `vYY.MM` branch and a PR from `vvYY.MM` to `develop` will be created (to sync the branches).
@@ -74,7 +71,6 @@ Some other essential things to check throughout the release process -
7471

7572
- If updating our custom vcpkg registory entries [pybamm-team/sundials-vcpkg-registry](https://github.com/pybamm-team/sundials-vcpkg-registry) or [pybamm-team/casadi-vcpkg-registry](https://github.com/pybamm-team/casadi-vcpkg-registry) (used to build Windows wheels), make sure to update the baseline of the registories in vcpkg-configuration.json to the latest commit id.
7673
- Update jax and jaxlib to the latest version in `pybamm.util` and `pyproject.toml`, fixing any bugs that arise
77-
- Make sure the URLs in `docs/_static/versions.json` are valid
7874
- As the release workflow is initiated by the `release` event, it's important to note that the default `GITHUB_REF` used by `actions/checkout` during the checkout process will correspond to the tag created during the release process. Consequently, the workflows will consistently build PyBaMM based on the commit associated with this tag. Should new commits be introduced to the `vYY.MM` branch, such as those addressing build issues, it becomes necessary to manually update this tag to point to the most recent commit -
7975
```
8076
git tag -f <tag_name> <commit_hash>

.github/workflows/run_periodic_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- name: Check style
3737
run: |
3838
python -m pip install pre-commit
39+
git add .
3940
pre-commit run ruff
4041
4142
build:

.github/workflows/test_on_push.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- name: Check style
2929
run: |
3030
python -m pip install pre-commit
31+
git add .
3132
pre-commit run ruff
3233
3334
run_unit_tests:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ results/
138138
# do not ignore images in _static folder in docs
139139
!docs/_static/favicon/favicon.png
140140
!docs/_static/pybamm_logo.png
141+
!docs/_static/pybamm_logo_whitetext.png
141142

142143
# tests
143144
test_callback.log

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
# [Unreleased](https://github.com/pybamm-team/PyBaMM/)
22

3+
## Features
4+
5+
- Added a new unary operator, `EvaluateAt`, that evaluates a spatial variable at a given position ([#3573](https://github.com/pybamm-team/PyBaMM/pull/3573))
6+
- Added a method, `insert_reference_electrode`, to `pybamm.lithium_ion.BaseModel` that insert a reference electrode to measure the electrolyte potential at a given position in space and adds new variables that mimic a 3E cell setup. ([#3573](https://github.com/pybamm-team/PyBaMM/pull/3573))
7+
- Serialisation added so models can be written to/read from JSON ([#3397](https://github.com/pybamm-team/PyBaMM/pull/3397))
8+
- Mechanical parameters are now a function of stoichiometry and temperature ([#3576](https://github.com/pybamm-team/PyBaMM/pull/3576))
9+
310
## Bug fixes
411

12+
- Fixed a bug where simulations using the CasADi-based solvers would fail randomly with the half-cell model ([#3494](https://github.com/pybamm-team/PyBaMM/pull/3494))
513
- Fixed bug that made identical Experiment steps with different end times crash ([#3516](https://github.com/pybamm-team/PyBaMM/pull/3516))
614
- Fixed bug in calculation of theoretical energy that made it very slow ([#3506](https://github.com/pybamm-team/PyBaMM/pull/3506))
715
- The irreversible plating model now increments `f"{Domain} dead lithium concentration [mol.m-3]"`, not `f"{Domain} lithium plating concentration [mol.m-3]"` as it did previously. ([#3485](https://github.com/pybamm-team/PyBaMM/pull/3485))

GOVERNANCE.md

Lines changed: 0 additions & 140 deletions
This file was deleted.

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ graft pybamm
22
include CITATION.cff
33
prune tests
44

5-
exclude CHANGELOG.md CODE-OF-CONDUCT.md CONTRIBUTING.md GOVERNANCE.md CMakeLists.txt
5+
exclude CHANGELOG.md CODE-OF-CONDUCT.md CONTRIBUTING.md CMakeLists.txt
66

77
global-exclude __pycache__ *.py[cod] .venv

0 commit comments

Comments
 (0)