From 80b50f05da01327f31f04c82346aee52f54c4c52 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 20 Sep 2025 12:38:13 -0500 Subject: [PATCH 1/4] fix: do not use appname for config extension entry points --- docs/glossary.rst | 2 ++ docs/narr/config/object.rst | 2 ++ src/wuttjamaican/conf.py | 4 +++- tests/test_conf.py | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/glossary.rst b/docs/glossary.rst index 0e4c48a..c01a4ec 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -137,6 +137,8 @@ Glossary The intention is that all config extensions will have been applied before the :term:`app handler` is created. + See also :ref:`config-extensions`. + config file A file which contains :term:`config settings`. See also :doc:`narr/config/files`. diff --git a/docs/narr/config/object.rst b/docs/narr/config/object.rst index b792133..8eb9448 100644 --- a/docs/narr/config/object.rst +++ b/docs/narr/config/object.rst @@ -56,6 +56,8 @@ to solve the "chicken-vs-egg" problem:: app = config.get_app() +.. _config-extensions: + Extending the Config Object --------------------------- diff --git a/src/wuttjamaican/conf.py b/src/wuttjamaican/conf.py index d30f90c..c799da6 100644 --- a/src/wuttjamaican/conf.py +++ b/src/wuttjamaican/conf.py @@ -1040,7 +1040,9 @@ def make_config( # pylint: disable=too-many-arguments,too-many-positional-argum # maybe extend config object if extend: if not extension_entry_points: - extension_entry_points = f"{appname}.config.extensions" + # nb. must not use appname here, entry points must be + # consistent regardless of appname + extension_entry_points = "wutta.config.extensions" # apply all registered extensions # TODO: maybe let config disable some extensions? diff --git a/tests/test_conf.py b/tests/test_conf.py index 18953b3..684387e 100644 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -931,7 +931,7 @@ class TestMakeConfig(FileTestCase): WuttaConfig.assert_called_once_with( [], appname="wuttatest", usedb=None, preferdb=None ) - load_entry_points.assert_called_once_with("wuttatest.config.extensions") + load_entry_points.assert_called_once_with("wutta.config.extensions") # confirm extensions are invoked load_entry_points.reset_mock() @@ -945,7 +945,7 @@ class TestMakeConfig(FileTestCase): WuttaConfig.assert_called_once_with( [], appname="wuttatest", usedb=None, preferdb=None ) - load_entry_points.assert_called_once_with("wuttatest.config.extensions") + load_entry_points.assert_called_once_with("wutta.config.extensions") foo_cls.assert_called_once_with() foo_obj.configure.assert_called_once_with(testconfig) foo_obj.startup.assert_called_once_with(testconfig) From 9bbd92d6836ee4b5cb38d9725d476034d0bddde3 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 20 Sep 2025 12:38:43 -0500 Subject: [PATCH 2/4] fix: log warning when sending email is requested but disabled --- src/wuttjamaican/email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wuttjamaican/email.py b/src/wuttjamaican/email.py index ab4040c..f752dc7 100644 --- a/src/wuttjamaican/email.py +++ b/src/wuttjamaican/email.py @@ -725,7 +725,7 @@ class EmailHandler(GenericHandler): # pylint: disable=too-many-public-methods # make sure sending is enabled log.debug("sending email from %s; to %s", sender, recips) if not self.sending_is_enabled(): - log.debug("nevermind, config says no emails") + log.warning("email sending is disabled") return # smtp connect From ae23381bac8239395863d6729c139c5e182385de Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 20 Sep 2025 12:39:03 -0500 Subject: [PATCH 3/4] docs: add ref for section on config include files --- docs/narr/config/files.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/narr/config/files.rst b/docs/narr/config/files.rst index 0a6eafe..148d7b1 100644 --- a/docs/narr/config/files.rst +++ b/docs/narr/config/files.rst @@ -118,6 +118,8 @@ confirmed by inspecting either setups) the log file. +.. _config-includes: + Including More Files -------------------- From f4d8d69cb27d63f98346cdd3322e4da50a8b555a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 20 Sep 2025 12:39:38 -0500 Subject: [PATCH 4/4] =?UTF-8?q?bump:=20version=200.23.1=20=E2=86=92=200.23?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ea308..c811550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to WuttJamaican will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v0.23.2 (2025-09-20) + +### Fix + +- log warning when sending email is requested but disabled +- do not use appname for config extension entry points + ## v0.23.1 (2025-08-31) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 43b79b1..c4edb2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "WuttJamaican" -version = "0.23.1" +version = "0.23.2" description = "Base package for Wutta Framework" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}]