From e29e8e0761a6c7f6531277e34044628a5716dafc Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 7 Aug 2022 19:10:03 -0500 Subject: [PATCH] Register entry points for emails and stop declaring via old way in config --- corporal/config.py | 1 - setup.py | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/corporal/config.py b/corporal/config.py index e8d4a17..1f890bc 100644 --- a/corporal/config.py +++ b/corporal/config.py @@ -18,7 +18,6 @@ class CorporalConfig(ConfigExtension): # set some default config values config.setdefault('rattail', 'model', 'corporal.db.model') - config.setdefault('rattail.mail', 'emails', 'corporal.emails') config.setdefault('rattail', 'settings', 'corporal.settings') config.setdefault('tailbone', 'menus', 'corporal.web.menus') config.setdefault('rattail.config', 'templates', 'corporal:data/config rattail:data/config') diff --git a/setup.py b/setup.py index 82ca632..4c620b7 100644 --- a/setup.py +++ b/setup.py @@ -94,10 +94,6 @@ setup( entry_points = { - 'rattail.config.extensions': [ - 'corporal = corporal.config:CorporalConfig', - ], - 'console_scripts': [ 'corporal = corporal.commands:main', ], @@ -109,5 +105,13 @@ setup( 'paste.app_factory': [ 'main = corporal.web.app:main', ], + + 'rattail.config.extensions': [ + 'corporal = corporal.config:CorporalConfig', + ], + + 'rattail.emails': [ + 'corporal = corporal.emails', + ], }, )