From 3ece00f05958781b725e28499cb7f1fe16b91106 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 9 Jun 2023 19:59:09 -0500 Subject: [PATCH] Remove curated email settings just use entry points like other apps --- theo/config.py | 7 ------- theo/emails/__init__.py | 0 theo/emails/catapult.py | 27 --------------------------- theo/emails/catapult_mirror.py | 29 ----------------------------- theo/emails/corepos.py | 28 ---------------------------- theo/emails/locsms.py | 27 --------------------------- theo/emails/theo.py | 33 --------------------------------- 7 files changed, 151 deletions(-) delete mode 100644 theo/emails/__init__.py delete mode 100644 theo/emails/catapult.py delete mode 100644 theo/emails/catapult_mirror.py delete mode 100644 theo/emails/corepos.py delete mode 100644 theo/emails/locsms.py delete mode 100644 theo/emails/theo.py diff --git a/theo/config.py b/theo/config.py index 78c55ce..9385fcf 100644 --- a/theo/config.py +++ b/theo/config.py @@ -49,7 +49,6 @@ class TheoConfig(ConfigExtension): if integrate_corepos(config): config.setdefault('rattail', 'model', 'theo.db.model_corepos') config.setdefault('rattail', 'settings', 'theo.appsettings.theo') - config.setdefault('rattail.mail', 'emails', 'theo.emails.theo, theo.emails.corepos') config.setdefault('rattail', 'products.handler', 'rattail_corepos.products:CoreProductsHandler') config.setdefault('rattail.batch', 'vendor_catalog.handler', 'rattail_corepos.batch.vendorcatalog:VendorCatalogHandler') config.setdefault('rattail.importing', 'versions.handler', 'theo.importing.versions_corepos:FromTheoToTheoVersions') @@ -58,22 +57,16 @@ class TheoConfig(ConfigExtension): elif integrate_catapult(config): config.setdefault('rattail', 'model', 'theo.db.model_catapult') config.setdefault('rattail', 'settings', 'theo.appsettings.theo, theo.appsettings.catapult') - emails = ['theo.emails.theo', 'theo.emails.catapult'] - if mirror_posdb(config): - emails.append('theo.emails.catapult_mirror') - config.setdefault('rattail.mail', 'emails', ', '.join(emails)) config.setdefault('rattail.importing', 'versions.handler', 'theo.importing.versions_catapult:FromTheoToTheoVersions') # do we integrate w/ LOC SMS? elif integrate_locsms(config): config.setdefault('rattail', 'model', 'theo.db.model_locsms') config.setdefault('rattail', 'settings', 'theo.appsettings.theo') - config.setdefault('rattail.mail', 'emails', 'theo.emails.theo, theo.emails.locsms') config.setdefault('rattail.importing', 'versions.handler', 'theo.importing.versions_locsms:FromTheoToTheoVersions') else: # no integration config.setdefault('rattail', 'settings', 'theo.appsettings.theo') - config.setdefault('rattail.mail', 'emails', 'theo.emails.theo') def integrate_catapult(config): diff --git a/theo/emails/__init__.py b/theo/emails/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/theo/emails/catapult.py b/theo/emails/catapult.py deleted file mode 100644 index 72b29fd..0000000 --- a/theo/emails/catapult.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# -# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# Rattail. If not, see . -# -################################################################################ -""" -Theo email profile settings -""" - -from rattail_onager.emails import rattail_import_catapult_updates diff --git a/theo/emails/catapult_mirror.py b/theo/emails/catapult_mirror.py deleted file mode 100644 index eaddcc0..0000000 --- a/theo/emails/catapult_mirror.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# -# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# Rattail. If not, see . -# -################################################################################ -""" -Theo email profile settings -""" - -from rattail_onager.emails import ( - rattail_onager_import_catapult_updates, -) diff --git a/theo/emails/corepos.py b/theo/emails/corepos.py deleted file mode 100644 index c7a1f74..0000000 --- a/theo/emails/corepos.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# -# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# Rattail. If not, see . -# -################################################################################ -""" -Theo email profile settings -""" - -from rattail_corepos.emails import (rattail_import_corepos_api_updates, - rattail_import_corepos_db_updates) diff --git a/theo/emails/locsms.py b/theo/emails/locsms.py deleted file mode 100644 index 6321549..0000000 --- a/theo/emails/locsms.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2020 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# -# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# Rattail. If not, see . -# -################################################################################ -""" -Theo email profile settings -""" - -from rattail_luckysmores.emails import rattail_import_locsms_updates diff --git a/theo/emails/theo.py b/theo/emails/theo.py deleted file mode 100644 index 93a685b..0000000 --- a/theo/emails/theo.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2021 Lance Edgar -# -# This file is part of Rattail. -# -# Rattail is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# -# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# Rattail. If not, see . -# -################################################################################ -""" -Theo email profile settings -""" - -# bring in some common config from rattail -from rattail.emails import (upgrade_failure, - upgrade_success, - user_feedback, - rattail_import_versions_updates, - new_email_requested, - new_phone_requested)