From 760ceb84eeb88376740a735b000331d7e2956674 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Tue, 19 Dec 2023 09:26:35 +0000 Subject: [PATCH 1/4] Increment version to 23.12 --- CHANGELOG.md | 5 +++++ CITATION.cff | 1 + pybop/version.py | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd9d7180c..f6645b2f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Features +## Bug Fixes + +# [v23.12]() +## Features + - [#141](https://github.com/pybop-team/PyBOP/pull/141) - Adds documentation with Sphinx and PyData Sphinx Theme. Updates docstrings across package, relocates `costs` and `dataset` to top-level of package. Adds noxfile session and deployment workflow for docs. - [#131](https://github.com/pybop-team/PyBOP/issues/131) - Adds `SciPyDifferentialEvolution` optimiser, adds functionality for user-selectable maximum iteration limit to `SciPyMinimize`, `NLoptOptimize`, and `BaseOptimiser` classes. - [#107](https://github.com/pybop-team/PyBOP/issues/107) - Adds Equivalent Circuit Model (ECM) with examples, Import/Export parameter methods `ParameterSet.import_parameter` and `ParameterSet.export_parameters`, updates default FittingProblem.signal definition to `"Voltage [V]"`, and testing infrastructure diff --git a/CITATION.cff b/CITATION.cff index e1efab891..11ce822fd 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -11,4 +11,5 @@ authors: family-names: Courtier - given-names: David family-names: Howey +version: "23.12" # Update this when you release a new version repository-code: 'https://www.github.com/pybop-team/pybop' diff --git a/pybop/version.py b/pybop/version.py index 915a9aedb..f3d58cf85 100644 --- a/pybop/version.py +++ b/pybop/version.py @@ -1 +1 @@ -__version__ = "23.11" +__version__ = "23.12" From f2d842042560d264db002eee010d50c5ffa75eb2 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Tue, 19 Dec 2023 09:41:01 +0000 Subject: [PATCH 2/4] Updt CHANGELOG 23.12 hyperlink --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6645b2f8..3269d5696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ## Bug Fixes -# [v23.12]() +# [v23.12](https://github.com/pybop-team/PyBOP/tree/v23.12) - 2023-12-19 ## Features - [#141](https://github.com/pybop-team/PyBOP/pull/141) - Adds documentation with Sphinx and PyData Sphinx Theme. Updates docstrings across package, relocates `costs` and `dataset` to top-level of package. Adds noxfile session and deployment workflow for docs. From 3f825a51f7fc88da2c4213cf501041a0c32498cd Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Tue, 19 Dec 2023 09:59:30 +0000 Subject: [PATCH 3/4] Updt. trigger for release workflow --- .github/workflows/release-action.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-action.yaml b/.github/workflows/release-action.yaml index 44f326739..c7bea10a8 100644 --- a/.github/workflows/release-action.yaml +++ b/.github/workflows/release-action.yaml @@ -2,9 +2,8 @@ name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI on: workflow_dispatch: - pull_request: - branches: - - main + release: + types: [created, published] jobs: build: @@ -34,7 +33,9 @@ jobs: publish-to-pypi: name: >- Publish Python 🐍 distribution 📦 to PyPI - if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes + if: > + startsWith(github.ref, 'refs/tags/') && + !contains(github.ref, 'rc') needs: - build runs-on: ubuntu-latest From c0eb5a610429bf99e3d81c0abe23c189fabe6e9e Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Tue, 19 Dec 2023 10:03:27 +0000 Subject: [PATCH 4/4] Add pre-release trigger --- .github/workflows/release-action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-action.yaml b/.github/workflows/release-action.yaml index c7bea10a8..8cbaa5f4f 100644 --- a/.github/workflows/release-action.yaml +++ b/.github/workflows/release-action.yaml @@ -3,7 +3,7 @@ name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI on: workflow_dispatch: release: - types: [created, published] + types: [published, prereleased] jobs: build: