From 57f0e1f0920fd499dc57c3cdde4fc3339964e282 Mon Sep 17 00:00:00 2001 From: Priyanshu Agarwal Date: Thu, 11 Nov 2021 08:45:33 +0530 Subject: [PATCH 1/2] Bump version --- .github/workflows/build_wheels.yml | 2 +- docs/requirements.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 74f712a1b1..c663fdba2f 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download wheels - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: wheels diff --git a/docs/requirements.txt b/docs/requirements.txt index 9f8d290eee..2dab106555 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -17,4 +17,4 @@ matplotlib >= 2.0 # guzzle-sphinx-theme sphinx>4.0 -sympy==1.8 +sympy==1.9 diff --git a/requirements.txt b/requirements.txt index cbd88f3be0..b23c8f2cf9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ casadi >= 3.5.0 imageio>=2.9.0 jupyter # For example notebooks pybtex -sympy==1.8 +sympy==1.9 # Note: Matplotlib is loaded for debug plots but to ensure pybamm runs # on systems without an attached display it should never be imported # outside of plot() methods. diff --git a/setup.py b/setup.py index 30360be38f..55fd14a2bc 100644 --- a/setup.py +++ b/setup.py @@ -195,7 +195,7 @@ def compile_KLU(): "imageio>=2.9.0", "jupyter", # For example notebooks "pybtex", - "sympy==1.8", + "sympy==1.9", # Note: Matplotlib is loaded for debug plots, but to ensure pybamm runs # on systems without an attached display, it should never be imported # outside of plot() methods. From 2743768c58539e8e1656c9a9c5927a68a07d9862 Mon Sep 17 00:00:00 2001 From: Priyanshu Agarwal Date: Thu, 11 Nov 2021 08:46:42 +0530 Subject: [PATCH 2/2] Format whitespace --- pybamm/CITATIONS.txt | 44 ++++++++++++++++++++++---------------------- tox.ini | 16 ++++++++-------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pybamm/CITATIONS.txt b/pybamm/CITATIONS.txt index f2e797b7d5..d9177d8bba 100644 --- a/pybamm/CITATIONS.txt +++ b/pybamm/CITATIONS.txt @@ -192,17 +192,17 @@ } @article{Kirk2021, - author = {Toby L. Kirk and Colin P. Please and S. Jon Chapman}, - title = {Physical Modelling of the Slow Voltage Relaxation Phenomenon in Lithium-Ion Batteries}, - journal = {Journal of The Electrochemical Society}, - year = 2021, - month = {jun}, - publisher = {The Electrochemical Society}, - volume = {168}, - number = {6}, - pages = {060554}, - doi = {10.1149/1945-7111/ac0bf7}, - url = {https://doi.org/10.1149/1945-7111/ac0bf7}, + author = {Toby L. Kirk and Colin P. Please and S. Jon Chapman}, + title = {Physical Modelling of the Slow Voltage Relaxation Phenomenon in Lithium-Ion Batteries}, + journal = {Journal of The Electrochemical Society}, + year = 2021, + month = {jun}, + publisher = {The Electrochemical Society}, + volume = {168}, + number = {6}, + pages = {060554}, + doi = {10.1149/1945-7111/ac0bf7}, + url = {https://doi.org/10.1149/1945-7111/ac0bf7}, } @article{Lain2019, @@ -283,17 +283,17 @@ } @article{OKane2020, - doi = {10.1149/1945-7111/ab90ac}, - url = {https://doi.org/10.1149/1945-7111/ab90ac}, - year = {2020}, - month = {may}, - publisher = {The Electrochemical Society}, - volume = {167}, - number = {9}, - pages = {090540}, - author = {Simon E. J. O'Kane and Ian D. Campbell and Mohamed W. J. Marzook and Gregory J. Offer and Monica Marinescu}, - title = {Physical Origin of the Differential Voltage Minimum Associated with Lithium Plating in Li-Ion Batteries}, - journal = {Journal of The Electrochemical Society} + doi = {10.1149/1945-7111/ab90ac}, + url = {https://doi.org/10.1149/1945-7111/ab90ac}, + year = {2020}, + month = {may}, + publisher = {The Electrochemical Society}, + volume = {167}, + number = {9}, + pages = {090540}, + author = {Simon E. J. O'Kane and Ian D. Campbell and Mohamed W. J. Marzook and Gregory J. Offer and Monica Marinescu}, + title = {Physical Origin of the Differential Voltage Minimum Associated with Lithium Plating in Li-Ion Batteries}, + journal = {Journal of The Electrochemical Society} } @article{ORegan2021, diff --git a/tox.ini b/tox.ini index 396c5652d0..45d0084e4a 100644 --- a/tox.ini +++ b/tox.ini @@ -19,13 +19,13 @@ deps = !windows-!mac: scikits.odes commands = - tests-!windows-!mac: sh -c "pybamm_install_jax" # install jax, jaxlib for ubuntu - tests: python run-tests.py --unit --folder all - quick: python run-tests.py --unit - integration: python run-tests.py --unit --folder integration - examples: python run-tests.py --examples - dev-!windows-!mac: sh -c "echo export LD_LIBRARY_PATH={env:LD_LIBRARY_PATH} >> {envbindir}/activate" - doctests: python run-tests.py --doctest + tests-!windows-!mac: sh -c "pybamm_install_jax" # install jax, jaxlib for ubuntu + tests: python run-tests.py --unit --folder all + quick: python run-tests.py --unit + integration: python run-tests.py --unit --folder integration + examples: python run-tests.py --examples + dev-!windows-!mac: sh -c "echo export LD_LIBRARY_PATH={env:LD_LIBRARY_PATH} >> {envbindir}/activate" + doctests: python run-tests.py --doctest [testenv:pybamm-requires] platform = [linux,darwin] @@ -37,7 +37,7 @@ deps = cmake commands = python {toxinidir}/scripts/install_KLU_Sundials.py - - git clone https://github.com/pybind/pybind11.git {toxinidir}/pybind11 + - git clone https://github.com/pybind/pybind11.git {toxinidir}/pybind11 [testenv:flake8] skip_install = true