Skip to content

Commit e39ec59

Browse files
martinjrobinsmartinjrobins
committed
merge develop
2 parents 2ad4aa1 + 804ea24 commit e39ec59

File tree

201 files changed

+3494
-3291
lines changed

Some content is hidden

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

201 files changed

+3494
-3291
lines changed

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,15 @@
465465
"contributions": [
466466
"code"
467467
]
468+
},
469+
{
470+
"login": "KAschad",
471+
"name": "KAschad",
472+
"avatar_url": "https://avatars.githubusercontent.com/u/93784399?v=4",
473+
"profile": "https://github.com/KAschad",
474+
"contributions": [
475+
"bug"
476+
]
468477
}
469478
],
470479
"contributorsPerLine": 7,

‎.github/ISSUE_TEMPLATE/bug_report.md‎

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

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Bug Report
2+
description: File a bug report
3+
title: "[Bug]: "
4+
labels: ["bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
- type: input
11+
id: PyBaMM-version
12+
attributes:
13+
label: PyBaMM Version
14+
description: What version of PyBaMM are you running?
15+
placeholder: PyBaMM version
16+
validations:
17+
required: true
18+
- type: input
19+
id: python-version
20+
attributes:
21+
label: Python Version
22+
description: What version of python are you running?
23+
placeholder: python version
24+
validations:
25+
required: true
26+
- type: textarea
27+
id: what-happened
28+
attributes:
29+
label: Describe the bug
30+
description: A clear and concise description of what the bug is.
31+
validations:
32+
required: true
33+
- type: textarea
34+
id: reproduce
35+
attributes:
36+
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)
38+
validations:
39+
required: true
40+
- type: textarea
41+
id: logs
42+
attributes:
43+
label: Relevant log output
44+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
45+
render: shell

‎.github/ISSUE_TEMPLATE/config.yml‎

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

‎.github/ISSUE_TEMPLATE/feature_request.md‎

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

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Feature Request
2+
description: Suggest an idea for this project
3+
labels: ["feature"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this form!
9+
- type: textarea
10+
id: description
11+
attributes:
12+
label: Description
13+
description: Explanation of the feature.
14+
validations:
15+
required: true
16+
- type: textarea
17+
id: motivation
18+
attributes:
19+
label: Motivation
20+
description: Why are we doing this? What use cases does it support? What is the expected outcome?
21+
- type: textarea
22+
id: implementation
23+
attributes:
24+
label: Possible Implementation
25+
description: Suggest an idea for implementing the addition or change.
26+
- type: textarea
27+
id: additional-context
28+
attributes:
29+
label: Additional context
30+
description: Add any other context or screenshots about the feature request here.

‎.github/release_checklist.md‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
- Increment version number in
2-
- `pybamm/version`
3-
- `docs/conf.py`
4-
- `CITATION.cff`
5-
- `vcpkg.json`
6-
- Update CHANGELOG.md with a summary of the release
1+
- Run `scripts/update_version.py` to
2+
- Increment version number in
3+
- `pybamm/version.py`
4+
- `docs/conf.py`
5+
- `CITATION.cff`
6+
- `vcpkg.json`
7+
- Update baseline of registries in `vcpkg-configuration.json` as the latest commit id from [pybamm-team/sundials-vcpkg-registry](https://github.com/pybamm-team/sundials-vcpkg-registry)
8+
- Update `CHANGELOG.md` with a summary of the release
9+
710
- Update jax and jaxlib to latest version in `pybamm.util` and fix any bugs that arise
11+
- If building wheels on Windows gives a `vcpkg` related error - revert the baseline of default-registry to a stable commit in `vcpkg-configuration.json`

‎.github/workflows/build_wheels.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ jobs:
4141
CIBW_BEFORE_ALL_LINUX: "bash build_manylinux_wheels/install_sundials.sh 5.8.1 5.7.0"
4242
CIBW_BEFORE_BUILD_LINUX: "python -m pip install cmake"
4343

44+
# see https://github.com/pybamm-team/PyBaMM/pull/1930
45+
- name: Install the latest version of vcpkg on windows
46+
if: matrix.os == 'windows-latest'
47+
run: |
48+
cd C:\
49+
rm -r -fo 'C:\vcpkg'
50+
git clone https://github.com/microsoft/vcpkg
51+
cd vcpkg
52+
.\bootstrap-vcpkg.bat
53+
4454
- name: Cache packages installed through vcpkg on windows
4555
if: matrix.os == 'windows-latest'
4656
uses: actions/cache@v2
@@ -50,16 +60,12 @@ jobs:
5060
path: C:\Users\runneradmin\AppData\Local\vcpkg\archives
5161
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('vcpkg.json') }}
5262

53-
- name: Build 32 bits wheels on Windows
54-
if: matrix.os == 'windows-latest'
55-
run: python -m cibuildwheel --output-dir wheelhouse
56-
env:
57-
CIBW_ENVIRONMENT: "PYBAMM_USE_VCPKG=ON VCPKG_ROOT_DIR=$VCPKG_INSTALLATION_ROOT VCPKG_DEFAULT_TRIPLET=x86-windows-static VCPKG_FEATURE_FLAGS=manifests,registries CMAKE_GENERATOR=\"Visual Studio 16 2019\" CMAKE_GENERATOR_PLATFORM=Win32"
58-
CIBW_ARCHS: "x86"
59-
6063
- name: Build 64 bits wheels on Windows
6164
if: matrix.os == 'windows-latest'
62-
run: python -m cibuildwheel --output-dir wheelhouse
65+
run: |
66+
choco install --yes visualstudio2019community
67+
choco install --yes visualstudio2019-workload-nativedesktop
68+
python -m cibuildwheel --output-dir wheelhouse
6369
env:
6470
CIBW_ENVIRONMENT: "PYBAMM_USE_VCPKG=ON VCPKG_ROOT_DIR=$cd/vcpkg VCPKG_DEFAULT_TRIPLET=x64-windows-static VCPKG_FEATURE_FLAGS=manifests,registries CMAKE_GENERATOR=\"Visual Studio 16 2019\" CMAKE_GENERATOR_PLATFORM=x64"
6571
CIBW_ARCHS: "AMD64"

‎.github/workflows/create_release.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Create GitHub release
2+
3+
on:
4+
push:
5+
branches: main
6+
workflow_dispatch:
7+
8+
jobs:
9+
create-release:
10+
# This workflow is only of value to PyBaMM and would always be skipped in forks
11+
if: github.repository_owner == 'pybamm-team'
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
15+
strategy:
16+
matrix:
17+
python-version: [3.8]
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- name: Get current date
23+
run: |
24+
echo "VERSION=$(date +'v%y.%-m')" >> $GITHUB_ENV
25+
echo "TODAY=$(date +'%d')" >> $GITHUB_ENV
26+
27+
- name: Fail the job if date < 20
28+
if: ${{ env.TODAY }} < 20
29+
uses: actions/github-script@v5
30+
with:
31+
script: core.setFailed('This workflow should be triggered only at the end of the month, or else it will create a release for the wrong month.')
32+
33+
- name: Set up Python ${{ matrix.python-version }}
34+
uses: actions/setup-python@v2
35+
with:
36+
python-version: ${{ matrix.python-version }}
37+
38+
- name: Install dependencies
39+
run: |
40+
pip install wheel
41+
pip install --editable .
42+
43+
- name: Get Changelog
44+
run: python -c "from scripts.update_version import get_changelog; get_changelog()"
45+
46+
- name: Create release
47+
uses: softprops/action-gh-release@v1
48+
with:
49+
tag_name: ${{ env.VERSION }}
50+
body_path: CHANGELOG.md

‎.github/workflows/test_on_push.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ jobs:
8787
if: matrix.os == 'ubuntu-latest'
8888
run: tox -e pybamm-requires
8989

90-
- name: Run unit tests for GNU/Linux with Python 3.8 and 3.9
91-
if: matrix.os == 'ubuntu-latest' && matrix.python-version != 3.7
90+
- name: Run unit tests for GNU/Linux with Python 3.7 and 3.8
91+
if: matrix.os == 'ubuntu-latest' && matrix.python-version != 3.9
9292
run: python -m tox -e unit
9393

94-
- name: Run unit tests for GNU/Linux with Python 3.7 and generate coverage report
95-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.7
94+
- name: Run unit tests for GNU/Linux with Python 3.9 and generate coverage report
95+
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.9
9696
run: tox -e coverage
9797

9898
- name: Upload coverage report
99-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.7
99+
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.9
100100
uses: codecov/[email protected]
101101

102102
- name: Run integration tests for GNU/Linux

0 commit comments

Comments
 (0)