From ba37c8010f9ad2aee8929df24504ddb58011a8bf Mon Sep 17 00:00:00 2001 From: Roberto Prevato Date: Thu, 28 Dec 2023 10:01:14 +0100 Subject: [PATCH] Prepare for 3.12 --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 5 +++++ pyproject.toml | 9 +++++++-- requirements.txt | 3 +-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4572e6..076cc0e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index ce9ae42..8d11b42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.4] - 2023-12-28 :snowman_with_snow: +- Improve the library to deep-merge dictionaries of values instead of replacing + objects entirely (fix [#10](https://github.com/Neoteroi/essentials-configuration/issues/10)), by @StummeJ. +- Add Python 3.12 to the build matrix. + ## [2.0.3] - 2023-04-15 :crown: - Adopts `Rich`, through `rich-click` for the project CLI. - Renames the recently added `secrets` feature to `settings`. diff --git a/pyproject.toml b/pyproject.toml index a2ca48c..aee7601 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "essentials-configuration" -version = "2.0.3" +version = "2.0.4" authors = [{ name = "Roberto Prevato", email = "roberto.prevato@gmail.com" }] description = "Implementation of key-value pair based configuration for Python applications." readme = "README.md" @@ -17,11 +17,16 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: OS Independent", ] keywords = ["configuration", "root", "management", "strategy", "settings"] -dependencies = ["deepmerge~=1.1.0", "tomli; python_version < '3.11'", "python-dotenv~=1.0.0"] +dependencies = [ + "deepmerge~=1.1.0", + "tomli; python_version < '3.11'", + "python-dotenv~=1.0.0", +] [project.optional-dependencies] yaml = ["PyYAML"] diff --git a/requirements.txt b/requirements.txt index efe10ba..d401dad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ appdirs==1.4.4 attrs==22.1.0 -black==22.10.0 +black build==0.10.0 click==8.1.3 coverage==6.5.0 @@ -33,5 +33,4 @@ rich==13.3.4 rich-click==1.6.1 toml==0.10.2 tomli==2.0.1 -typed-ast==1.5.4 typing_extensions==4.5.0