Skip to content

Commit 13ebe0c

Browse files
MarcBerlinerDavidMStraubagriyakhetarpal
authored andcommitted
Unpin numpy, bump pybammsolvers (#5204)
* Update pyproject.toml * update docs * update invalid docs Co-Authored-By: David Straub <[email protected]> * Update pyproject.toml Co-authored-by: Agriya Khetarpal <[email protected]> --------- Co-authored-by: David Straub <[email protected]> Co-authored-by: Agriya Khetarpal <[email protected]>
1 parent 7819c82 commit 13ebe0c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

docs/source/user_guide/installation/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ PyBaMM requires the following dependencies.
6060
=================================================================== ==========================
6161
Package Supported version(s)
6262
=================================================================== ==========================
63-
`PyBaMM solvers <https://github.com/pybamm-team/pybammsolvers>`__ >= 0.2.0, <0.3.0
64-
`NumPy <https://numpy.org>`__ >= 1.23.5, <2
63+
`PyBaMM solvers <https://github.com/pybamm-team/pybammsolvers>`__ >= 0.2.0, <0.4.0
64+
`NumPy <https://numpy.org>`__ Whatever recent versions work
6565
`SciPy <https://docs.scipy.org/doc/scipy/>`__ Whatever recent versions work. >= 1.9.3
6666
`CasADi <https://web.casadi.org/docs/>`__ Whatever recent versions work. >= 3.6.7
6767
`Xarray <https://docs.xarray.dev/en/stable/>`__ Whatever recent versions work. >= 2022.6.0

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ classifiers = [
2828
"Topic :: Scientific/Engineering",
2929
]
3030
dependencies = [
31-
"pybammsolvers>=0.2.0,<0.3.0",
32-
"numpy>=1.23.5,<2.0.0",
31+
"pybammsolvers>=0.3.0,<0.4.0",
32+
"numpy",
3333
"scipy>=1.11.4",
3434
"casadi==3.6.7",
3535
"xarray>=2022.6.0",

src/pybamm/expression_tree/operations/serialise.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,11 +786,10 @@ def convert_symbol_to_json(
786786
>>> from pybamm.expression_tree.operations.serialise import Serialise
787787
>>> s = pybamm.Scalar(5)
788788
>>> Serialise.convert_symbol_to_json(s)
789-
{'type': 'Scalar', 'value': 5.0}
790-
789+
{'type': 'Scalar', 'value': np.float64(5.0)}
791790
>>> v = pybamm.Variable("c")
792791
>>> Serialise.convert_symbol_to_json(v)
793-
{'type': 'Variable', 'name': 'c', 'domains': {'primary': [], 'secondary': [], 'tertiary': [], 'quaternary': []}, 'bounds': [{'type': 'Scalar', 'value': -inf}, {'type': 'Scalar', 'value': inf}]}
792+
{'type': 'Variable', 'name': 'c', 'domains': {'primary': [], 'secondary': [], 'tertiary': [], 'quaternary': []}, 'bounds': [{'type': 'Scalar', 'value': np.float64(-inf)}, {'type': 'Scalar', 'value': np.float64(inf)}]}
794793
"""
795794

796795
if isinstance(symbol, numbers.Number | list):

0 commit comments

Comments
 (0)