Skip to content

Commit

Permalink
Merge branch 'develop' into 339-updating-capacities
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolaCourtier authored Jun 18, 2024
2 parents d8f2cf1 + 5e1c7f8 commit 4be3162
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

## Features


- [#316](https://github.com/pybop-team/PyBOP/pull/316) - Adds Adam with weight decay (AdamW) optimiser, adds depreciation warning for pints.Adam implementation.
- [#271](https://github.com/pybop-team/PyBOP/issues/271) - Aligns the output of the optimisers via a generalisation of Result class.
- [#315](https://github.com/pybop-team/PyBOP/pull/315) - Updates __init__ structure to remove circular import issues and minimises dependancy imports across codebase for faster PyBOP module import. Adds type-hints to BaseModel and refactors rebuild parameter variables.
Expand Down Expand Up @@ -38,6 +37,15 @@
- [#270](https://github.com/pybop-team/PyBOP/pull/270) - Updates PR template.
- [#91](https://github.com/pybop-team/PyBOP/issues/91) - Adds a check on the number of parameters for CMAES and makes XNES the default optimiser.

# [v24.3.1](https://github.com/pybop-team/PyBOP/tree/v24.3.1) - 2024-06-17

## Features


## Bug Fixes

- [#369](https://github.com/pybop-team/PyBOP/pull/369) - Upper pins Numpy < 2.0 due to breaking Pints' functionality.

# [v24.3](https://github.com/pybop-team/PyBOP/tree/v24.3) - 2024-03-25

## Features
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ authors:
family-names: Courtier
- given-names: David
family-names: Howey
version: "24.3" # Update this when you release a new version
version: "24.3.1" # Update this when you release a new version
repository-code: 'https://www.github.com/pybop-team/pybop'
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "pybop"
version = "24.3"
version = "24.3.1"
authors = [
{name = "The PyBOP Team"},
]
Expand All @@ -27,7 +27,7 @@ classifiers = [
requires-python = ">=3.9, <3.13"
dependencies = [
"pybamm>=23.9",
"numpy>=1.16",
"numpy>=1.16, <2.0",
"scipy>=1.3",
"pints>=0.5",
"bpx>=0.4",
Expand Down
4 changes: 2 additions & 2 deletions tests/plotting/test_plotly_manager.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import subprocess
from distutils.spawn import find_executable
from importlib.metadata import distributions
from shutil import which

import numpy as np
import plotly
Expand All @@ -10,7 +10,7 @@
from pybop import PlotlyManager

# Find the Python executable
python_executable = find_executable("python")
python_executable = which("python")


@pytest.fixture(scope="session")
Expand Down

0 comments on commit 4be3162

Please sign in to comment.