Skip to content

Commit d026075

Browse files
authored
Merge pull request #4289 from pybamm-team/v24.5
Release v24.5
2 parents bb6fc9b + 7661ed9 commit d026075

File tree

439 files changed

+16286
-109914
lines changed

Some content is hidden

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

439 files changed

+16286
-109914
lines changed

.all-contributorsrc

Lines changed: 150 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"files": [
3+
"all_contributors.md",
34
"README.md"
45
],
56
"imageSize": 100,
67
"commit": false,
78
"badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg)](#-contributors)",
89
"contributors": [
910
{
10-
"login": "tinosulzer",
11+
"login": "valentinsulzer",
1112
"name": "Valentin Sulzer",
1213
"avatar_url": "https://avatars3.githubusercontent.com/u/20817509?v=4",
1314
"profile": "https://sites.google.com/view/valentinsulzer",
@@ -215,7 +216,8 @@
215216
"profile": "https://github.com/jonchapman1",
216217
"contributions": [
217218
"ideas",
218-
"fundingFinding"
219+
"fundingFinding",
220+
"doc"
219221
]
220222
},
221223
{
@@ -772,7 +774,9 @@
772774
"avatar_url": "https://avatars.githubusercontent.com/u/99216956?v=4",
773775
"profile": "https://github.com/prady0t",
774776
"contributions": [
775-
"infra"
777+
"infra",
778+
"code",
779+
"test"
776780
]
777781
},
778782
{
@@ -793,6 +797,149 @@
793797
"contributions": [
794798
"code"
795799
]
800+
},
801+
{
802+
"login": "AlessioBugetti",
803+
"name": "Alessio Bugetti",
804+
"avatar_url": "https://avatars.githubusercontent.com/u/38499721?v=4",
805+
"profile": "https://github.com/AlessioBugetti",
806+
"contributions": [
807+
"infra",
808+
"code",
809+
"doc",
810+
"test"
811+
]
812+
},
813+
{
814+
"login": "kawaMANMI",
815+
"name": "kawaMANMI",
816+
"avatar_url": "https://avatars.githubusercontent.com/u/39382602?v=4",
817+
"profile": "https://github.com/kawaMANMI",
818+
"contributions": [
819+
"bug",
820+
"code"
821+
]
822+
},
823+
{
824+
"login": "Akhil-Sharma30",
825+
"name": "AKHIL SHARMA",
826+
"avatar_url": "https://avatars.githubusercontent.com/u/68015525?v=4",
827+
"profile": "http://akhilsharma.info",
828+
"contributions": [
829+
"doc"
830+
]
831+
},
832+
{
833+
"login": "HarshvirSandhu",
834+
"name": "Harshvir Sandhu",
835+
"avatar_url": "https://avatars.githubusercontent.com/u/75773763?v=4",
836+
"profile": "https://github.com/HarshvirSandhu",
837+
"contributions": [
838+
"code"
839+
]
840+
},
841+
{
842+
"login": "lorenzofavaro",
843+
"name": "Lorenzo",
844+
"avatar_url": "https://avatars.githubusercontent.com/u/44714920?v=4",
845+
"profile": "https://github.com/lorenzofavaro",
846+
"contributions": [
847+
"code",
848+
"test",
849+
"doc"
850+
]
851+
},
852+
{
853+
"login": "AndyLiuElysia",
854+
"name": "AndyLiuElysia",
855+
"avatar_url": "https://avatars.githubusercontent.com/u/143705453?v=4",
856+
"profile": "https://github.com/AndyLiuElysia",
857+
"contributions": [
858+
"doc"
859+
]
860+
},
861+
{
862+
"login": "Hongmeiqi",
863+
"name": "Hongmeiqi",
864+
"avatar_url": "https://avatars.githubusercontent.com/u/143798726?v=4",
865+
"profile": "https://github.com/Hongmeiqi",
866+
"contributions": [
867+
"doc"
868+
]
869+
},
870+
{
871+
"login": "mleot",
872+
"name": "mleot",
873+
"avatar_url": "https://avatars.githubusercontent.com/u/140573653?v=4",
874+
"profile": "https://github.com/mleot",
875+
"contributions": [
876+
"code",
877+
"test"
878+
]
879+
},
880+
{
881+
"login": "abhicodes369",
882+
"name": "Abhi ram",
883+
"avatar_url": "https://avatars.githubusercontent.com/u/119055274?v=4",
884+
"profile": "https://github.com/abhicodes369",
885+
"contributions": [
886+
"test"
887+
]
888+
},
889+
{
890+
"login": "parkec3",
891+
"name": "Caitlin D. Parke",
892+
"avatar_url": "https://avatars.githubusercontent.com/u/26883801?v=4",
893+
"profile": "https://github.com/parkec3",
894+
"contributions": [
895+
"code"
896+
]
897+
},
898+
{
899+
"login": "Afgr1087",
900+
"name": "Andres Felipe Galvis Rodriguez",
901+
"avatar_url": "https://avatars.githubusercontent.com/u/56610829?v=4",
902+
"profile": "https://github.com/Afgr1087",
903+
"contributions": [
904+
"code"
905+
]
906+
},
907+
{
908+
"login": "ikorotkin",
909+
"name": "Ivan Korotkin",
910+
"avatar_url": "https://avatars.githubusercontent.com/u/29599800?v=4",
911+
"profile": "https://github.com/ikorotkin",
912+
"contributions": [
913+
"code"
914+
]
915+
},
916+
{
917+
"login": "santacodes",
918+
"name": "Santhosh",
919+
"avatar_url": "https://avatars.githubusercontent.com/u/52504160?v=4",
920+
"profile": "https://github.com/santacodes",
921+
"contributions": [
922+
"code",
923+
"infra"
924+
]
925+
},
926+
{
927+
"login": "smitasahu2",
928+
"name": "Smita Sahu",
929+
"avatar_url": "https://avatars.githubusercontent.com/u/57876346?v=4",
930+
"profile": "https://github.com/smitasahu2",
931+
"contributions": [
932+
"code"
933+
]
934+
},
935+
{
936+
"login": "Ubham16",
937+
"name": "Ubham16",
938+
"avatar_url": "https://avatars.githubusercontent.com/u/173074476?v=4",
939+
"profile": "https://github.com/Ubham16",
940+
"contributions": [
941+
"code"
942+
]
796943
}
797944
],
798945
"contributorsPerLine": 7,

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ a63e49ece0f9336d1f5c2562f7459e555c6e6693
1010
ff6d81c01331c7d269303b4a8321d9881bdf98fa
1111
# migrated to ruff-format - https://github.com/pybamm-team/PyBaMM/pull/3655
1212
60ebd4148059a95428a496f4f55c1175ead362d3
13+
# implemented cleaner string formatting via f-strings - https://github.com/pybamm-team/PyBaMM/pull/3890
14+
f395819d1c874071b7e76e32ec4f0bbe42462b48

.github/CODEOWNERS

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Automatically request reviews from maintainers
2+
3+
# Package
4+
/pybamm/discretisations/ @martinjrobins @rtimms @valentinsulzer
5+
/pybamm/experiment/ @brosaplanella @martinjrobins @rtimms @valentinsulzer @TomTranter
6+
/pybamm/expression_tree/ @martinjrobins @rtimms @valentinsulzer
7+
/pybamm/geometry/ @martinjrobins @rtimms @valentinsulzer
8+
/pybamm/input/ @brosaplanella @DrSOKane @rtimms @valentinsulzer @TomTranter @kratman
9+
/pybamm/meshes/ @martinjrobins @rtimms @valentinsulzer @rtimms
10+
/pybamm/models/ @brosaplanella @DrSOKane @rtimms @valentinsulzer @TomTranter @rtimms
11+
/pybamm/parameters/ @brosaplanella @DrSOKane @rtimms @valentinsulzer @TomTranter @rtimms @kratman
12+
/pybamm/plotting/ @martinjrobins @rtimms @Saransh-cpp @valentinsulzer @rtimms @kratman @agriyakhetarpal
13+
/pybamm/solvers/ @martinjrobins @rtimms @valentinsulzer @TomTranter @rtimms
14+
/pybamm/spatial_methods/ @martinjrobins @rtimms @valentinsulzer @rtimms
15+
/pybamm/* @pybamm-team/maintainers # the files directly under /pybamm/, will not recurse
16+
17+
# CI/CD workflows
18+
/.github/ @martinjrobins @Saransh-cpp @agriyakhetarpal @kratman @arjxn-py
19+
20+
# Benchmarks
21+
/benchmarks/ @brosaplanella @Saransh-cpp @agriyakhetarpal @arjxn-py
22+
23+
# Documentation
24+
/docs/ @kratman @arjxn-py @agriyakhetarpal @Saransh-cpp
25+
26+
# Example scripts
27+
/examples/ @kratman @agriyakhetarpal @Saransh-cpp
28+
29+
# Installation and other scripts
30+
/scripts/ @martinjrobins @Saransh-cpp @agriyakhetarpal @kratman @arjxn-py
31+
32+
# Files in the root directory
33+
/* @martinjrobins @Saransh-cpp @agriyakhetarpal @kratman @arjxn-py
34+
/CHANGELOG.md # no owner (almost every PR edits the CHANGELOG)

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ body:
3434
id: reproduce
3535
attributes:
3636
label: Steps to Reproduce
37-
description: Tell us how to reproduce this behaviour. Ideally, this should take the form of a [Minimum Workable Example](https://stackoverflow.com/help/minimal-reproducible-example)
37+
description: Tell us how to reproduce this behaviour. Ideally, this should include a code block which produces the error. Strive to make this example as small and simple as possible. It should contain the code required to reproduce the error, and no additional code. For example, if your code includes lines to run a simulation, then lines to plot the results, and the lines to run the simulation fail, only include those lines (and not the plotting lines, which are irrelevant). Often, the act of simplifying code to pinpoint errors can help you find bugs in your own code. For more information, see [these references](https://en.wikipedia.org/wiki/Minimal_reproducible_example#External_links)
3838
validations:
3939
required: true
4040
- type: textarea

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: true
22
contact_links:
33
- name: I'm unsure where to go
4-
url: https://www.pybamm.org/contact
4+
url: https://www.pybamm.org/community
55
about: If you are unsure where to go, then joining our chat is recommended; Just ask!

.github/codecov.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
ignore:
2-
- pybamm/install_odes.py

.github/workflows/benchmark_on_push.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Run benchmarks on push
22
on:
33
push:
44
branches: [main, develop]
5-
pull_request:
65

76
concurrency:
87
# Cancel intermediate builds always
@@ -14,10 +13,10 @@ jobs:
1413
runs-on: ubuntu-latest
1514
steps:
1615
- uses: actions/checkout@v4
17-
- name: Set up Python 3.8
16+
- name: Set up Python 3.12
1817
uses: actions/setup-python@v5
1918
with:
20-
python-version: 3.8
19+
python-version: 3.12
2120

2221
- name: Install Linux system dependencies
2322
run: |

.github/workflows/docker.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@ on:
77
- develop
88

99
jobs:
10-
build_docker_images:
10+
build_docker_image:
1111
# This workflow is only of value to PyBaMM and would always be skipped in forks
1212
if: github.repository_owner == 'pybamm-team'
13-
name: Image (${{ matrix.build-args }})
13+
name: Build image
1414
runs-on: ubuntu-latest
15-
strategy:
16-
matrix:
17-
build-args: ["No solvers", "JAX", "ODES", "IDAKLU", "ALL"]
18-
fail-fast: true
1915

2016
steps:
2117
- name: Checkout
@@ -33,27 +29,12 @@ jobs:
3329
username: ${{ secrets.DOCKERHUB_USERNAME }}
3430
password: ${{ secrets.DOCKERHUB_TOKEN }}
3531

36-
- name: Create tags for Docker images based on build-time arguments
37-
id: tags
38-
run: |
39-
if [ "${{ matrix.build-args }}" = "No solvers" ]; then
40-
echo "tag=latest" >> "$GITHUB_OUTPUT"
41-
elif [ "${{ matrix.build-args }}" = "JAX" ]; then
42-
echo "tag=jax" >> "$GITHUB_OUTPUT"
43-
elif [ "${{ matrix.build-args }}" = "ODES" ]; then
44-
echo "tag=odes" >> "$GITHUB_OUTPUT"
45-
elif [ "${{ matrix.build-args }}" = "IDAKLU" ]; then
46-
echo "tag=idaklu" >> "$GITHUB_OUTPUT"
47-
elif [ "${{ matrix.build-args }}" = "ALL" ]; then
48-
echo "tag=all" >> "$GITHUB_OUTPUT"
49-
fi
50-
51-
- name: Build and push Docker image to Docker Hub (${{ matrix.build-args }})
52-
uses: docker/build-push-action@v5
32+
- name: Build and push Docker image to Docker Hub
33+
uses: docker/build-push-action@v6
5334
with:
5435
context: .
5536
file: scripts/Dockerfile
56-
tags: pybamm/pybamm:${{ steps.tags.outputs.tag }}
37+
tags: pybamm/pybamm:latest
5738
push: true
5839
platforms: linux/amd64, linux/arm64
5940

.github/workflows/lychee_url_checker.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
# cache Lychee results to avoid hitting rate limits
1919
- name: Restore lychee cache
20-
uses: actions/cache@v3
20+
uses: actions/cache@v4
2121
with:
2222
path: .lycheecache
2323
key: cache-lychee-${{ github.sha }}
@@ -28,7 +28,7 @@ jobs:
2828

2929
# use stable version for now to avoid breaking changes
3030
- name: Lychee URL checker
31-
uses: lycheeverse/lychee-action@v1.8.0
31+
uses: lycheeverse/lychee-action@v1.10.0
3232
with:
3333
# arguments with file types to check
3434
args: >-
@@ -47,6 +47,7 @@ jobs:
4747
--exclude-path ./scripts/update_version.py
4848
--exclude-path asv.conf.json
4949
--exclude-path docs/conf.py
50+
--exclude-path all_contributors.md
5051
'./**/*.rst'
5152
'./**/*.md'
5253
'./**/*.py'

.github/workflows/need_reply_remove.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Remove needs-reply label
22

33
on:
4+
schedule:
5+
- cron: '0 3 * * 1'
46
issue_comment:
57
types:
68
- created
@@ -11,7 +13,8 @@ jobs:
1113
if: |
1214
github.event.comment.author_association != 'OWNER' &&
1315
github.event.comment.author_association != 'COLLABORATOR' &&
14-
github.repository_owner == 'pybamm-team'
16+
github.repository_owner == 'pybamm-team' &&
17+
github.event_name != 'pull_request'
1518
steps:
1619
- name: Remove needs-reply label
1720
uses: octokit/[email protected]

0 commit comments

Comments
 (0)