Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make release v22.9 #2325

Merged
merged 141 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
678a817
reformat BaseSolver.set_up with shorter functions
valentinsulzer Aug 2, 2022
5b6dd19
some more optimizations for the esoh model
valentinsulzer Aug 2, 2022
85e1384
move discontinuity setup to separate function
valentinsulzer Aug 2, 2022
f8162dd
#2040 add check for events with initial conditions
valentinsulzer Aug 2, 2022
ad29b70
#2040 starting experiment step skipping
valentinsulzer Aug 3, 2022
a8fa104
fix failing test
valentinsulzer Aug 5, 2022
4d19209
remove function diffusivities (they were constant anyway)
brosaplanella Aug 9, 2022
06022b9
improve docstring
brosaplanella Aug 9, 2022
3818f74
add test events
brosaplanella Aug 9, 2022
bd80d2c
remove Kim2011 ocp function
brosaplanella Aug 9, 2022
6b7241c
fix warning test t_eval drive cycle
brosaplanella Aug 9, 2022
f4d9251
add tests binary operators
brosaplanella Aug 10, 2022
ffc17f2
add tests simulation
brosaplanella Aug 10, 2022
c9f2107
flake8
brosaplanella Aug 10, 2022
bb0f545
flake8
brosaplanella Aug 10, 2022
008e7d9
add test to cover jac_algebraic case
brosaplanella Aug 10, 2022
23b4628
add some no cover lines
brosaplanella Aug 10, 2022
cd7640c
add tests and fix raise error
brosaplanella Aug 10, 2022
a0107c8
flake8
brosaplanella Aug 10, 2022
2bddb0c
#2040 uncomment tests
valentinsulzer Aug 18, 2022
ba6b325
Merge branch 'develop' into issue-2040-events
valentinsulzer Aug 18, 2022
bec5738
some bug fixes, changelog
valentinsulzer Aug 19, 2022
8407c20
Merge branch 'develop' into increase-coverage
brosaplanella Aug 23, 2022
948af41
add test copy scalar
brosaplanella Aug 23, 2022
ec7a29b
test error evaluate y_dot=None
brosaplanella Aug 23, 2022
e5a923e
increase coverage symbol.py
brosaplanella Aug 23, 2022
593764d
flake8
brosaplanella Aug 23, 2022
55320f6
comment out test
brosaplanella Aug 23, 2022
b1d7fbc
change general error statement in symbol.py
brosaplanella Aug 23, 2022
2788688
revert to previous and add no cover
brosaplanella Aug 23, 2022
cc1c868
flake8
brosaplanella Aug 23, 2022
6142676
try if linsolver works
brosaplanella Aug 24, 2022
01414e1
add test BoundaryGradient
brosaplanella Aug 24, 2022
73216c9
add test base spatial method
brosaplanella Aug 24, 2022
a3701d5
add linsolver tests
brosaplanella Aug 24, 2022
3c37f46
flake8
brosaplanella Aug 24, 2022
6b2d5b3
#2229 default linear interp
rtimms Aug 24, 2022
c4f50b6
fix typo with options
brosaplanella Aug 24, 2022
4d74029
Merge branch 'develop' into increase-coverage
brosaplanella Aug 24, 2022
7eb3677
Bug fix: added SEI on cracks to total_kinetics.py
Aug 25, 2022
b51ece8
Fixed conflicts
Aug 25, 2022
f1939bc
The space in reaction_name moved, because reasons
Aug 25, 2022
12240e5
Default options for 'particle mechanics' now dealt with differently i…
Aug 25, 2022
096c99a
merge develop
valentinsulzer Aug 27, 2022
d733db0
fix simulation with experiment tests
valentinsulzer Aug 29, 2022
b6dded8
Merge branch 'develop' into clean-up-base-solver
valentinsulzer Aug 29, 2022
7557e8a
Add pre commit config
priyanshuone6 Aug 29, 2022
9dc31a7
add workflow for validation repo
Vaibhav-Chopra-GT Sep 1, 2022
abaa7ff
Merge branch 'develop' into issue-2040-events
valentinsulzer Sep 2, 2022
a83fb06
working on tests
valentinsulzer Sep 2, 2022
1b9d375
#2275 remove ProcessedSymbolicVariable
valentinsulzer Sep 2, 2022
e0a7501
#2040 fix integration tests
valentinsulzer Sep 2, 2022
38650b8
#2040 fix unit test
valentinsulzer Sep 4, 2022
21f5b0a
remove old scripts
valentinsulzer Sep 4, 2022
ca8f24f
#2040 fix solver tests
valentinsulzer Sep 4, 2022
efb72aa
#2040 examples and coverage
valentinsulzer Sep 4, 2022
24d3790
#2040 coverage
valentinsulzer Sep 4, 2022
f550813
#2275 changelog
valentinsulzer Sep 5, 2022
faa08a2
Changed fundamental variable for SEI from thickness to concentration
Sep 5, 2022
2f18301
Fixed conflicts in base_interface.py and total_interfacial_current.py
Sep 5, 2022
4d235b5
fixed typo
Sep 5, 2022
6142acc
Merge pull request #2278 from pybamm-team/remove-old-scripts
valentinsulzer Sep 6, 2022
cd640a5
Merge pull request #2276 from pybamm-team/issue-2275-remove-processed…
valentinsulzer Sep 6, 2022
ab9d767
#2040 merge develop and update changelog
valentinsulzer Sep 6, 2022
831d903
Merge pull request #2209 from pybamm-team/clean-up-base-solver
valentinsulzer Sep 6, 2022
824f968
Merge branch 'develop' into issue-2040-events
valentinsulzer Sep 6, 2022
65b4645
Merge pull request #2212 from pybamm-team/issue-2040-events
valentinsulzer Sep 6, 2022
7866989
Merge branch 'develop' into faster-electrode-soh
valentinsulzer Sep 6, 2022
082f259
flake8
Sep 6, 2022
f0c4356
small changes, changelog
valentinsulzer Sep 7, 2022
a25abf6
simplify total current calculation by splitting by domain
valentinsulzer Sep 7, 2022
49185d0
flake8
valentinsulzer Sep 7, 2022
af45133
fix workflow
Vaibhav-Chopra-GT Sep 8, 2022
8c4b3d6
Merge pull request #2274 from Vaibhav-Chopra-GT/validation_
valentinsulzer Sep 8, 2022
7056363
fix integration tests
valentinsulzer Sep 8, 2022
be5c453
reformat options.phases
valentinsulzer Sep 8, 2022
8f04589
add proper test
valentinsulzer Sep 8, 2022
d0408e8
don't use functools.cached_property since it doesn't work on python 3.7
valentinsulzer Sep 8, 2022
8c18a88
add composite SEI model
valentinsulzer Sep 8, 2022
11cc3c9
fix flake8 and revert examples
valentinsulzer Sep 8, 2022
4689cd6
fix flake8 for real this time
valentinsulzer Sep 8, 2022
d6a03f7
flake8
valentinsulzer Sep 8, 2022
844e12c
fix lead-acid models
valentinsulzer Sep 8, 2022
00dcf48
skip Newman Tobias tests
valentinsulzer Sep 8, 2022
e2f4767
Changed primary SEI variable back to thickness
Sep 9, 2022
b8a8046
Merge pull request #2287 from pybamm-team/total-interfacial-current-b…
valentinsulzer Sep 9, 2022
dbdd188
Merge branch 'develop' into reformat-options-phases
valentinsulzer Sep 9, 2022
fa4ee80
Merge branch 'reformat-options-phases' into composite-sei
valentinsulzer Sep 9, 2022
463424e
fix examples
valentinsulzer Sep 9, 2022
b25ce8c
Merge pull request #2289 from pybamm-team/reformat-options-phases
valentinsulzer Sep 9, 2022
9a740a0
Merge branch 'develop' into composite-sei
valentinsulzer Sep 9, 2022
9417ea9
add specific evaluate for shape for min and max functions
valentinsulzer Sep 9, 2022
1205ec0
Merge branch 'develop' into faster-electrode-soh
valentinsulzer Sep 9, 2022
2c60416
coverage
valentinsulzer Sep 9, 2022
69eab27
add function to save which last pybamm commit
valentinsulzer Sep 11, 2022
35687d2
docs
valentinsulzer Sep 11, 2022
525e9b7
fix test
valentinsulzer Sep 11, 2022
e47c639
Update config
priyanshuone6 Sep 12, 2022
8224fc9
Update contributing
priyanshuone6 Sep 12, 2022
390b654
remove the style check
priyanshuone6 Sep 12, 2022
5ff3370
Merge branch 'develop' into black_action
priyanshuone6 Sep 12, 2022
0717339
empty commit
priyanshuone6 Sep 12, 2022
0f6e0c5
Merge branch 'develop' into issue-2229-linear-interp
rtimms Sep 12, 2022
c17c3f9
#2229 changelog
rtimms Sep 12, 2022
cb786ce
Merge pull request #2292 from pybamm-team/fix-evaluate-for-shape-for-…
valentinsulzer Sep 12, 2022
f9fe319
Merge pull request #2210 from pybamm-team/faster-electrode-soh
valentinsulzer Sep 12, 2022
332c352
fix docs
valentinsulzer Sep 12, 2022
bd18010
Merge branch 'develop' into save-git-commit
valentinsulzer Sep 12, 2022
4c24012
Merge branch 'develop' into composite-sei
valentinsulzer Sep 12, 2022
08c6a8d
codacy
valentinsulzer Sep 12, 2022
4ff87b6
Fixed conflicts and updated SEI on cracks example notebook
Sep 12, 2022
c097e19
CHANGELOG
Sep 12, 2022
34f6a00
Fixed conflict in CHANGELOG
Sep 12, 2022
2065f6d
Merge pull request #2262 from DrSOKane/develop
valentinsulzer Sep 12, 2022
8026dac
changelog
valentinsulzer Sep 12, 2022
256da26
Merge pull request #2293 from pybamm-team/save-git-commit
valentinsulzer Sep 13, 2022
05c5fab
Update workflow
priyanshuone6 Sep 13, 2022
0412542
Merge branch 'develop' into black_action
priyanshuone6 Sep 13, 2022
669af80
Merge pull request #2258 from pybamm-team/issue-2229-linear-interp
rtimms Sep 13, 2022
8f214ef
rob comments
valentinsulzer Sep 13, 2022
1542815
Merge branch 'develop' into black_action
priyanshuone6 Sep 14, 2022
577f325
Valentin's comments
brosaplanella Sep 14, 2022
cf767e3
fix test
valentinsulzer Sep 14, 2022
d59b9b1
changelog
valentinsulzer Sep 15, 2022
a957d17
Merge pull request #2290 from pybamm-team/composite-sei
valentinsulzer Sep 15, 2022
96e57ec
Merge pull request #2223 from pybamm-team/increase-coverage
valentinsulzer Sep 15, 2022
c95d238
Remove prettier
priyanshuone6 Sep 18, 2022
381aca7
Merge branch 'develop' into black_action
priyanshuone6 Sep 18, 2022
0054efe
pre-commit fixes
priyanshuone6 Sep 19, 2022
e5662a9
style: pre-commit fixes
pre-commit-ci[bot] Sep 19, 2022
3228004
Bug fix to temperature dependence of OKane2022 positive electrode
Sep 21, 2022
10560b6
Merge branch 'develop' of https://github.com/pybamm-team/PyBaMM into …
Sep 21, 2022
43a9ab6
changelog
Sep 21, 2022
f5d16bc
Merge pull request #2309 from DrSOKane/develop
valentinsulzer Sep 21, 2022
e275bc5
Merge branch 'develop' into black_action
priyanshuone6 Sep 27, 2022
200021e
style: pre-commit fixes
pre-commit-ci[bot] Sep 27, 2022
0c617fc
Merge pull request #2272 from priyanshuone6/black_action
valentinsulzer Sep 27, 2022
9f1fe6d
Use pypa/gh-action-pypi-publish@release/v1
Saransh-cpp Sep 27, 2022
75cfa69
Merge pull request #2323 from Saransh-cpp/publish-pypi-action
valentinsulzer Sep 27, 2022
6159689
Update version to v22.9
Sep 28, 2022
a1091ec
Merge pull request #2324 from pybamm-team/create-pull-request/patch-7…
brosaplanella Sep 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .bettercodehub.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
component_depth: 2
languages:
- name: python
production:
exclude:
- /docs
- /examples
- /input
- /scripts
test:
include:
- /tests
- name: python
production:
exclude:
- /docs
- /examples
- /input
- /scripts
test:
include:
- /tests
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ blank_issues_enabled: true
contact_links:
- name: I'm unsure where to go
url: https://www.pybamm.org/contact
about: If you are unsure where to go, then joining our chat is recommended; Just ask!
about: If you are unsure where to go, then joining our chat is recommended; Just ask!
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ body:
id: additional-context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
description: Add any other context or screenshots about the feature request here.
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Please add a line in the relevant section of [CHANGELOG.md](https://github.com/p
- [ ] Optimization (back-end change that speeds up the code)
- [ ] Bug fix (non-breaking change which fixes an issue)


# Key checklist:

- [ ] No style issues: `$ flake8`
Expand Down
2 changes: 1 addition & 1 deletion .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ignore:
- pybamm/parameters_cli.py
- pybamm/install_odes.py
- pybamm/install_odes.py
3 changes: 2 additions & 1 deletion .github/release_checklist.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Run `scripts/update_version.py` to

- Increment version number in
- `pybamm/version.py`
- `docs/conf.py`
Expand All @@ -8,4 +9,4 @@
- Update `CHANGELOG.md` with a summary of the release

- Update jax and jaxlib to latest version in `pybamm.util` and fix any bugs that arise
- If building wheels on Windows gives a `vcpkg` related error - revert the baseline of default-registry to a stable commit in `vcpkg-configuration.json`
- If building wheels on Windows gives a `vcpkg` related error - revert the baseline of default-registry to a stable commit in `vcpkg-configuration.json`
62 changes: 31 additions & 31 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,34 @@ jobs:
python-version: [3.8]

steps:
- uses: actions/checkout@v3

- name: Get current date
run: |
echo "VERSION=$(date +'v%y.%-m')" >> $GITHUB_ENV
echo "TODAY=$(date +'%d')" >> $GITHUB_ENV

- name: Fail the job if date < 20
if: env.TODAY < 20
uses: actions/github-script@v5
with:
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.')

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
pip install wheel
pip install --editable .

- name: Get Changelog
run: python -c "from scripts.update_version import get_changelog; get_changelog()"

- name: Create release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ env.VERSION }}
body_path: CHANGELOG.md
- uses: actions/checkout@v3

- name: Get current date
run: |
echo "VERSION=$(date +'v%y.%-m')" >> $GITHUB_ENV
echo "TODAY=$(date +'%d')" >> $GITHUB_ENV

- name: Fail the job if date < 20
if: env.TODAY < 20
uses: actions/github-script@v5
with:
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.')

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
pip install wheel
pip install --editable .

- name: Get Changelog
run: python -c "from scripts.update_version import get_changelog; get_changelog()"

- name: Create release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ env.VERSION }}
body_path: CHANGELOG.md
9 changes: 4 additions & 5 deletions .github/workflows/periodic_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ jobs:
git commit -am "Add new results"
git push
- name: Publish results
run:
|
asv publish
git fetch origin gh-pages:gh-pages
asv gh-pages
run: |
asv publish
git fetch origin gh-pages:gh-pages
asv gh-pages
11 changes: 4 additions & 7 deletions .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
inputs:
target:
description: 'Deployment target. Can be "pypi" or "testpypi"'
default: 'pypi'
default: "pypi"

jobs:
build_windows_wheels:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
run: |
python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_ENVIRONMENT: "PYBAMM_USE_VCPKG=ON VCPKG_ROOT_DIR=$cd/vcpkg VCPKG_DEFAULT_TRIPLET=x64-windows-static-md VCPKG_FEATURE_FLAGS=manifests,registries CMAKE_GENERATOR=\"Visual Studio 17 2022\" CMAKE_GENERATOR_PLATFORM=x64"
CIBW_ENVIRONMENT: 'PYBAMM_USE_VCPKG=ON VCPKG_ROOT_DIR=$cd/vcpkg VCPKG_DEFAULT_TRIPLET=x64-windows-static-md VCPKG_FEATURE_FLAGS=manifests,registries CMAKE_GENERATOR="Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM=x64'
CIBW_ARCHS: "AMD64"

- name: Upload windows wheels
Expand All @@ -56,7 +56,6 @@ jobs:
path: ./wheelhouse/*.whl
if-no-files-found: error


build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -103,7 +102,6 @@ jobs:
path: ./wheelhouse/*.whl
if-no-files-found: error


build_sdist:
name: Build sdist
runs-on: ubuntu-latest
Expand All @@ -130,7 +128,6 @@ jobs:
path: ./dist/*.tar.gz
if-no-files-found: error


publish_pypi:
name: Upload package to PyPI
needs: [build_wheels, build_windows_wheels, build_sdist]
Expand All @@ -148,15 +145,15 @@ jobs:
if: |
github.event.inputs.target == 'pypi' ||
(github.event_name == 'push' && github.ref == 'refs/heads/main')
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
packages_dir: files/

- name: Publish on TestPyPI
if: github.event.inputs.target == 'testpypi'
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.TESTPYPI_TOKEN }}
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/run_benchmarks_over_history.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ on:
workflow_dispatch:
inputs:
commit_start:
description: 'Identifier of commit from which to start'
default: 'v0.1.0'
description: "Identifier of commit from which to start"
default: "v0.1.0"
commit_end:
description: 'Identifier of commit at which to end'
default: 'develop'
description: "Identifier of commit at which to end"
default: "develop"
ncommits:
description: 'Number of commits to benchmark between commit_start and commit_end'
default: '100'
description: "Number of commits to benchmark between commit_start and commit_end"
default: "100"
jobs:
benchmarks:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -80,9 +80,7 @@ jobs:
git commit -am "Add new results"
git push
- name: Publish results
run:
|
asv publish
git fetch origin gh-pages:gh-pages
asv gh-pages

run: |
asv publish
git fetch origin gh-pages:gh-pages
asv gh-pages
Loading