From c10447063de6483a7e5c8a0dd495b570801f9607 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Mon, 17 Jun 2024 11:16:22 +0100 Subject: [PATCH 1/3] fix: upper pin numpy < 2.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 17fbf7b7..850a0147 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ classifiers = [] requires-python = ">=3.8, <3.13" dependencies = [ "pybamm>=23.5", - "numpy>=1.16", + "numpy>=1.16, <2.0", "scipy>=1.3", "pints>=0.5", ] From 7d637d30d90dc5f0a42c2f240e7faa4856f92532 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Mon, 17 Jun 2024 11:33:06 +0100 Subject: [PATCH 2/3] release: increment versions, changelog --- CHANGELOG.md | 9 +++++++++ CITATION.cff | 2 +- pyproject.toml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2a453c1..94800d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ ## Bug Fixes +# [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 diff --git a/CITATION.cff b/CITATION.cff index 11ce822f..a14af062 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -11,5 +11,5 @@ authors: family-names: Courtier - given-names: David family-names: Howey -version: "23.12" # 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' diff --git a/pyproject.toml b/pyproject.toml index 850a0147..20c1e73b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pybop" -version = "24.3" +version = "24.3.1" authors = [ {name = "The PyBOP Team"}, ] From 820cb7782529b8fa3b04efb4eb99699f65c41f56 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Mon, 17 Jun 2024 14:31:01 +0100 Subject: [PATCH 3/3] fix: remove deprecated distutils --- tests/plotting/test_plotly_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/plotting/test_plotly_manager.py b/tests/plotting/test_plotly_manager.py index fc562ff2..80bc3bb5 100644 --- a/tests/plotting/test_plotly_manager.py +++ b/tests/plotting/test_plotly_manager.py @@ -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 @@ -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")