Skip to content

Commit

Permalink
Merge pull request #1798 from priyanshuone6/bump_versions
Browse files Browse the repository at this point in the history
Bump versions and format whitespaces
  • Loading branch information
valentinsulzer committed Nov 11, 2021
2 parents 5fad596 + 2743768 commit 6e887ae
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ matplotlib >= 2.0
#
guzzle-sphinx-theme
sphinx>4.0
sympy==1.8
sympy==1.9
44 changes: 22 additions & 22 deletions pybamm/CITATIONS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down

0 comments on commit 6e887ae

Please sign in to comment.