diff --git a/CHANGELOG.md b/CHANGELOG.md index c811550..c4ea308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,6 @@ 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/docs/glossary.rst b/docs/glossary.rst index c01a4ec..0e4c48a 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -137,8 +137,6 @@ 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/files.rst b/docs/narr/config/files.rst index 148d7b1..0a6eafe 100644 --- a/docs/narr/config/files.rst +++ b/docs/narr/config/files.rst @@ -118,8 +118,6 @@ confirmed by inspecting either setups) the log file. -.. _config-includes: - Including More Files -------------------- diff --git a/docs/narr/config/object.rst b/docs/narr/config/object.rst index 8eb9448..b792133 100644 --- a/docs/narr/config/object.rst +++ b/docs/narr/config/object.rst @@ -56,8 +56,6 @@ to solve the "chicken-vs-egg" problem:: app = config.get_app() -.. _config-extensions: - Extending the Config Object --------------------------- diff --git a/pyproject.toml b/pyproject.toml index c4edb2d..43b79b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "WuttJamaican" -version = "0.23.2" +version = "0.23.1" description = "Base package for Wutta Framework" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}] diff --git a/src/wuttjamaican/conf.py b/src/wuttjamaican/conf.py index c799da6..d30f90c 100644 --- a/src/wuttjamaican/conf.py +++ b/src/wuttjamaican/conf.py @@ -1040,9 +1040,7 @@ def make_config( # pylint: disable=too-many-arguments,too-many-positional-argum # maybe extend config object if extend: if not extension_entry_points: - # nb. must not use appname here, entry points must be - # consistent regardless of appname - extension_entry_points = "wutta.config.extensions" + extension_entry_points = f"{appname}.config.extensions" # apply all registered extensions # TODO: maybe let config disable some extensions? diff --git a/src/wuttjamaican/email.py b/src/wuttjamaican/email.py index f752dc7..ab4040c 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.warning("email sending is disabled") + log.debug("nevermind, config says no emails") return # smtp connect diff --git a/tests/test_conf.py b/tests/test_conf.py index 684387e..18953b3 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("wutta.config.extensions") + load_entry_points.assert_called_once_with("wuttatest.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("wutta.config.extensions") + load_entry_points.assert_called_once_with("wuttatest.config.extensions") foo_cls.assert_called_once_with() foo_obj.configure.assert_called_once_with(testconfig) foo_obj.startup.assert_called_once_with(testconfig)