Skip to content

Commit

Permalink
Merge branch 'develop' into saransh/conda-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
kratman authored Dec 12, 2024
2 parents 95ba3fa + cecf87e commit 6f4ea8e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 0 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"files": [
"all_contributors.md",
"README.md"
],
"imageSize": 100,
"commit": false,
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: PyBaMM
on:
workflow_dispatch:
pull_request:
paths-ignore: [".all-contributorsrc", "all_contributors.md"]

env:
PYBAMM_DISABLE_TELEMETRY: "true"
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
[![code style](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/pybamm-team/PyBaMM/badge)](https://scorecard.dev/viewer/?uri=github.com/pybamm-team/PyBaMM)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-94-orange.svg)](#-contributors)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

</div>

# PyBaMM
Expand Down
5 changes: 5 additions & 0 deletions all_contributors.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-94-orange.svg)](#-contributors)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
Expand Down

0 comments on commit 6f4ea8e

Please sign in to comment.