From 12b9883e7bb944d72f98fd1ace0a640de63bc7a1 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Wed, 11 Sep 2024 16:18:31 +0100 Subject: [PATCH 1/3] removes optional [cite] dependency from pybamm --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a81ed61d9..60a58b476 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] requires-python = ">=3.9, <3.13" dependencies = [ - "pybamm[cite]>=24.9", + "pybamm>=24.9", "numpy>=1.16, <2.0", "scipy>=1.3", "pints>=0.5", From 2adc629442f55e120b6f0c606b459832377a263e Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Mon, 16 Sep 2024 09:34:15 +0100 Subject: [PATCH 2/3] update noxfile.py - remove installation dependencies --- noxfile.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/noxfile.py b/noxfile.py index d2e8adadb..d270c0fda 100644 --- a/noxfile.py +++ b/noxfile.py @@ -14,7 +14,6 @@ @nox.session def unit(session): - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) if PYBOP_SCHEDULED: session.run("pip", "install", f"pybamm=={PYBAMM_VERSION}", silent=False) @@ -23,7 +22,6 @@ def unit(session): @nox.session def coverage(session): - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) session.install("pip") if PYBOP_SCHEDULED: @@ -44,7 +42,6 @@ def coverage(session): @nox.session def plots(session): """Run the tests that generate plots.""" - session.install("setuptools", "wheel") session.install("-e", ".[plot,dev]", silent=False) session.install("pip") session.run("pytest", "--plots", "-n", "0") @@ -53,7 +50,6 @@ def plots(session): @nox.session def integration(session): """Run the integration tests.""" - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) session.run("pytest", "--integration") @@ -61,7 +57,6 @@ def integration(session): @nox.session def examples(session): """Run the examples and notebooks""" - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) session.run("pytest", "--examples") notebooks(session) @@ -70,7 +65,6 @@ def examples(session): @nox.session def notebooks(session): """Run the Jupyter notebooks.""" - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) if PYBOP_SCHEDULED: session.run("pip", "install", f"pybamm=={PYBAMM_VERSION}", silent=False) @@ -86,7 +80,6 @@ def notebooks(session): @nox.session(name="notebooks-overwrite") def notebooks_overwrite(session): """Run the Jupyter notebooks.""" - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) if PYBOP_SCHEDULED: session.run("pip", "install", f"pybamm=={PYBAMM_VERSION}", silent=False) @@ -103,7 +96,6 @@ def notebooks_overwrite(session): @nox.session(name="tests") def run_tests(session): """Run all the tests.""" - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) if PYBOP_SCHEDULED: session.run("pip", "install", f"pybamm=={PYBAMM_VERSION}", silent=False) @@ -118,7 +110,6 @@ def run_doc_tests(session): Checks if the documentation can be built, runs any doctests (currently not used). """ - session.install("setuptools", "wheel") session.install("-e", ".[plot,docs,dev]", silent=False) session.run("pytest", "--docs", "-n", "0") @@ -130,7 +121,6 @@ def lint(session): Credit: PyBaMM Team """ - session.install("setuptools", "wheel") session.install("pre-commit", silent=False) session.run("pre-commit", "run", "--all-files") @@ -149,7 +139,6 @@ def run_quick(session): @nox.session def benchmarks(session): """Run the benchmarks.""" - session.install("setuptools", "wheel") session.install("-e", ".[all,dev]", silent=False) session.install("asv[virtualenv]") session.run("asv", "run", "--show-stderr", "--python=same") @@ -161,7 +150,6 @@ def docs(session): Build the documentation and load it in a browser tab, rebuilding on changes. Credit: PyBaMM Team """ - session.install("setuptools", "wheel") envbindir = session.bin session.install("-e", ".[all,docs]", silent=False) session.chdir("docs") From edaa711787b0e71d3659973a4609beceafa08fb5 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Mon, 16 Sep 2024 09:49:41 +0100 Subject: [PATCH 3/3] increment versions, add CHANGELOG.md entry for #495 --- CHANGELOG.md | 11 +++++++++++ CITATION.cff | 2 +- docs/_static/switcher.json | 6 +++--- pyproject.toml | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7668f65f6..2a8834327 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,17 @@ ## Breaking Changes +# [v24.9.1](https://github.com/pybop-team/PyBOP/tree/v24.9.0) - 2024-09-16 + + +## Features + +## Bug Fixes + +- [#495](https://github.com/pybop-team/PyBOP/pull/495) - Bugfixes for Transformation class, adds `apply_transform` optional arg to `BaseCost` for transformation functionality. + +## Breaking Changes + # [v24.9.0](https://github.com/pybop-team/PyBOP/tree/v24.9.0) - 2024-09-10 ## Features diff --git a/CITATION.cff b/CITATION.cff index 0b6552e6e..bcf8d5872 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -11,5 +11,5 @@ authors: family-names: Courtier - given-names: David family-names: Howey -version: "24.9.0" # Update this when you release a new version +version: "24.9.1" # Update this when you release a new version repository-code: 'https://www.github.com/pybop-team/pybop' diff --git a/docs/_static/switcher.json b/docs/_static/switcher.json index 96ffb5291..b3f464b27 100644 --- a/docs/_static/switcher.json +++ b/docs/_static/switcher.json @@ -4,9 +4,9 @@ "url": "https://pybop-docs.readthedocs.io/en/latest/" }, { - "name": "v24.9.0 (stable)", - "version": "v24.9.0", - "url": "https://pybop-docs.readthedocs.io/en/v24.9.0/", + "name": "v24.9 (stable)", + "version": "v24.9", + "url": "https://pybop-docs.readthedocs.io/en/v24.9.1/", "preferred": true }, { diff --git a/pyproject.toml b/pyproject.toml index 60a58b476..5861aab76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pybop" -version = "24.9.0" +version = "24.9.1" authors = [ {name = "The PyBOP Team"}, ]