From dc13a795ba955a62141b7e96213ae1c4f991f435 Mon Sep 17 00:00:00 2001 From: Dom Batten Date: Thu, 9 Oct 2025 08:41:53 +0100 Subject: [PATCH 1/2] =?UTF-8?q?bump:=20version=202.0.1=20=E2=86=92=202.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ pyproject.toml | 2 +- scripts/setup-release.py | 2 +- scripts/util.py | 2 +- uv.lock | 2 +- 5 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..7c2b9eb --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,27 @@ +## v2.0.2 (2025-10-09) + +## v2.0.0 (2024-08-19) + +## v1.4.3 (2024-01-11) + +## v1.4.2 (2023-11-10) + +## v1.4.1 (2023-11-09) + +## v1.4.0 (2022-02-04) + +## v1.3.0 (2021-12-23) + +## v1.2.3 (2021-11-01) + +## v1.2.2 (2021-10-28) + +## v1.2.1 (2021-10-28) + +## v1.2.0 (2021-10-28) + +## v1.1.0 (2021-10-28) + +## v1.0.0 (2021-10-27) + +## v0.1.0 (2021-10-25) diff --git a/pyproject.toml b/pyproject.toml index 4338545..580c3dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "maison" -version = "2.0.1" +version = "2.0.2" description = "Read settings from config files" authors = [ { name = "Dom Batten", email = "dominic.batten@googlemail.com" }, diff --git a/scripts/setup-release.py b/scripts/setup-release.py index 365c288..5af8db0 100644 --- a/scripts/setup-release.py +++ b/scripts/setup-release.py @@ -38,7 +38,7 @@ def get_parser() -> argparse.ArgumentParser: def setup_release(increment: Optional[str] = None) -> None: """Prepares a release of the maison package. - Sets up a release branch from the branch develop, bumps the version, and creates a release commit. Does not tag the + Sets up a release branch from the main branch, bumps the version, and creates a release commit. Does not tag the release or push any changes. """ check_dependencies(path=REPO_FOLDER, dependencies=["git"]) diff --git a/scripts/util.py b/scripts/util.py index 69e6512..a1424b0 100644 --- a/scripts/util.py +++ b/scripts/util.py @@ -89,7 +89,7 @@ def create_release_branch(new_version: str) -> None: """Creates a release branch.""" commands: list[list[str]] = [ ["git", "status", "--porcelain"], - ["git", "checkout", "-b", f"release/{new_version}", "develop"], + ["git", "checkout", "-b", f"release/{new_version}", "main"], ] for command in commands: subprocess.run(command, cwd=REPO_FOLDER, capture_output=True, check=True) diff --git a/uv.lock b/uv.lock index 45cfdcc..c64122d 100644 --- a/uv.lock +++ b/uv.lock @@ -631,7 +631,7 @@ wheels = [ [[package]] name = "maison" -version = "2.0.1" +version = "2.0.2" source = { editable = "." } dependencies = [ { name = "loguru" }, From 7d86d27dd570c17e6daaca3bea001222c6421ea7 Mon Sep 17 00:00:00 2001 From: Dom Batten Date: Thu, 9 Oct 2025 08:47:22 +0100 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2b9eb..909eb0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## v2.0.2 (2025-10-09) +* Removes `toml` dependency as it's unmaintained and doesn't support TOML 1.0 +symtax. Replaced with `tomli`. +* Major refactor of the package to improve separation of concerns, testability, + and maintainability. + ## v2.0.0 (2024-08-19) ## v1.4.3 (2024-01-11)