docs: use markdown for readme file

.gitignore

@@ -1 +1,4 @@
+*~
+*.pyc
+dist/
 rattail_mailchimp.egg-info/

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to rattail-mailchimp 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.3.3 (2024-07-05)
+
+### Fix
+
+- define `host_key` for MailChimp -> Rattail import
+
+## v0.3.2 (2024-07-01)
+
+### Fix
+
+- remove legacy command definitions
+
+## v0.3.1 (2024-06-14)
+
+### Fix
+
+- fallback to `importlib_metadata` on older python
+
+## v0.3.0 (2024-06-10)
+
+### Feat
+
+- switch from setup.cfg to pyproject.toml + hatchling
+
 ## [0.2.1] - 2024-06-04
 ### Changed
 - Setup default handler for Mailchimp -> Rattail import.

README.md

@@ -0,0 +1,11 @@
+
+# rattail_mailchimp
+
+Rattail is a retail software framework, released under the GNU General
+Public License.
+
+This package contains software interfaces for the
+[MailChimp](https://mailchimp.com/) system.
+
+Please see the [Rattail Project](https://rattailproject.org/) for more
+information.

README.rst

@@ -1,14 +0,0 @@
-
-rattail_mailchimp
-=================
-
-Rattail is a retail software framework, released under the GNU General
-Public License.
-
-This package contains software interfaces for the `MailChimp`_ system.
-
-.. _`MailChimp`: https://mailchimp.com/
-
-Please see the `Rattail Project`_ for more information.
-
-.. _`Rattail Project`: https://rattailproject.org/

pyproject.toml

@@ -0,0 +1,54 @@
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+
+[project]
+name = "rattail-mailchimp"
+version = "0.3.3"
+description = "Rattail Software Interfaces for MailChimp"
+readme = "README.md"
+authors = [{name = "Lance Edgar", email = "lance@edbob.org"}]
+license = {text = "GNU GPL v3+"}
+classifiers = [
+        "Development Status :: 4 - Beta",
+        "Environment :: Console",
+        "Environment :: Web Environment",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+        "Natural Language :: English",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Topic :: Office/Business",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dependencies = [
+        "mailchimp3",
+        "rattail",
+]
+
+
+[project.entry-points."rattail.config.extensions"]
+rattail_mailchimp = "rattail_mailchimp.config:MailchimpConfigExtension"
+
+
+[project.entry-points."rattail.typer_imports"]
+rattail_mailchimp = "rattail_mailchimp.commands"
+
+
+[project.entry-points."rattail.emails"]
+rattail_mailchimp = "rattail_mailchimp.emails"
+
+
+[project.urls]
+Homepage = "https://rattailproject.org"
+Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-mailchimp"
+Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-mailchimp/files/master/CHANGELOG.md"
+
+
+[tool.commitizen]
+version_provider = "pep621"
+tag_format = "v$version"
+update_changelog_on_bump = true

rattail_mailchimp/_version.py

@@ -1,3 +1,9 @@
 # -*- coding: utf-8; -*-
 
-__version__ = '0.2.1'
+try:
+    from importlib.metadata import version
+except ImportError:
+    from importlib_metadata import version
+
+
+__version__ = version('rattail-mailchimp')

rattail_mailchimp/commands.py

@@ -26,7 +26,7 @@ Rattail Commands for MailChimp integration
 
 import typer
 
-from rattail.commands import rattail_typer, ImportSubcommand
+from rattail.commands import rattail_typer
 from rattail.commands.typer import importer_command, typer_get_runas_user
 from rattail.commands.importing import ImportCommandHandler
 
@@ -46,21 +46,3 @@ def import_mailchimp(
         config, import_handler_key='to_rattail.from_mailchimp.import')
     kwargs['user'] = typer_get_runas_user(ctx)
     handler.run(kwargs, progress=progress)
-
-
-class ImportMailChimp(ImportSubcommand):
-    """
-    Import data to Rattail, from MailChimp API
-    """
-    name = 'import-mailchimp'
-    description = __doc__.strip()
-    default_handler_spec = 'rattail_mailchimp.importing.mailchimp:FromMailChimpToRattail'
-
-    def get_handler_factory(self, **kwargs):
-        if self.config:
-            spec = self.config.get('rattail.importing', 'mailchimp.handler',
-                                   default=self.default_handler_spec)
-        else:
-            # just use default, for sake of cmd line help
-            spec = self.default_handler_spec
-        return self.app.load_object(spec)

rattail_mailchimp/config.py

@@ -24,10 +24,10 @@
 Config extensions for rattail-mailchimp
 """
 
-from rattail.config import ConfigExtension
+from wuttjamaican.conf import WuttaConfigExtension
 
 
-class MailchimpConfigExtension(ConfigExtension):
+class MailchimpConfigExtension(WuttaConfigExtension):
     """
     Config extension for rattail-mailchimp
     """

rattail_mailchimp/importing/mailchimp.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2023 Lance Edgar
+#  Copyright © 2010-2024 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -30,7 +30,6 @@ from collections import OrderedDict
 from mailchimp3 import MailChimp
 
 from rattail import importing
-from rattail.time import localtime, make_utc
 from rattail_mailchimp import importing as mailchimp_importing
 
 
@@ -38,7 +37,9 @@ class FromMailChimpToRattail(importing.ToRattailHandler):
     """
     Handler for MailChimp -> Rattail cache import
     """
+    host_key = 'mailchimp'
     host_title = "MailChimp"
+    generic_host_title = "MailChimp"
     
     def get_importers(self):
         importers = OrderedDict()
@@ -53,7 +54,7 @@ class FromMailChimp(importing.Importer):
     """
 
     def setup(self):
-        super(FromMailChimp, self).setup()
+        super().setup()
 
         self.api_key = self.config.require('mailchimp', 'api_key')
         self.mailchimp = MailChimp(self.api_key)
@@ -65,10 +66,10 @@ class FromMailChimp(importing.Importer):
             # issue..since we clearly have a UTC value
             value = value[:-6]
             dt = datetime.datetime.strptime(value, '%Y-%m-%dT%H:%M:%S')
-            dt = localtime(self.config, dt, from_utc=True)
+            dt = self.app.localtime(dt, from_utc=True)
         else:
             dt = datetime.datetime.strptime(value, '%Y-%m-%dT%H:%M:%S%z')
-            dt = localtime(self.config, dt)
+            dt = self.app.localtime(dt)
         return dt
 
 
@@ -95,7 +96,7 @@ class MailChimpListImporter(FromMailChimp, mailchimp_importing.model.MailChimpLi
         return {
             'id': mclist['id'],
             'name': mclist['name'],
-            'date_created': make_utc(date_created),
+            'date_created': self.app.make_utc(date_created),
         }
 
 
@@ -160,6 +161,6 @@ class MailChimpListMemberImporter(FromMailChimp, mailchimp_importing.model.MailC
             'status': member['status'],
             # TODO: this API endpoint does not appear to include this field?
             # 'unsubscribe_reason': member.get('unsubscribe_reason'),
-            'last_changed': make_utc(last_changed),
+            'last_changed': self.app.make_utc(last_changed),
             'source': member['source'],
         }

setup.cfg

@@ -1,48 +0,0 @@
-# -*- coding: utf-8; -*-
-
-[metadata]
-name = rattail-mailchimp
-version = attr: rattail_mailchimp.__version__
-author = Lance Edgar
-author_email = lance@edbob.org
-url = https://rattailproject.org/
-license = GNU GPL v3
-description = Rattail Software Interfaces for MailChimp
-long_description = file: README.rst
-classifiers =
-        Development Status :: 4 - Beta
-        Environment :: Console
-        Environment :: Web Environment
-        Intended Audience :: Developers
-        License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-        Natural Language :: English
-        Operating System :: OS Independent
-        Programming Language :: Python
-        Programming Language :: Python :: 3
-        Topic :: Office/Business
-        Topic :: Software Development :: Libraries :: Python Modules
-
-
-[options]
-install_requires =
-        mailchimp3
-        rattail
-
-packages = find:
-include_package_data = True
-zip_safe = False
-
-
-[options.entry_points]
-
-rattail.config.extensions =
-        rattail_mailchimp = rattail_mailchimp.config:MailchimpConfigExtension
-
-rattail.subcommands =
-        import-mailchimp = rattail_mailchimp.commands:ImportMailChimp
-
-rattail.typer_imports =
-        rattail_mailchimp = rattail_mailchimp.commands
-
-rattail.emails =
-        rattail_mailchimp = rattail_mailchimp.emails

setup.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8; -*-
-################################################################################
-#
-#  Rattail -- Retail Software Framework
-#  Copyright © 2010-2023 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 <http://www.gnu.org/licenses/>.
-#
-################################################################################
-
-from setuptools import setup
-
-setup()

tasks.py

@@ -30,17 +30,15 @@ import shutil
 from invoke import task
 
 
-here = os.path.abspath(os.path.dirname(__file__))
-exec(open(os.path.join(here, 'rattail_mailchimp', '_version.py')).read())
-
-
 @task
 def release(c):
     """
     Release a new version of 'rattail-mailchimp'.
     """
-    shutil.rmtree('rattail_mailchimp.egg-info')
+    if os.path.exists('dist'):
+        shutil.rmtree('dist')
+    if os.path.exists('rattail_mailchimp.egg-info'):
+        shutil.rmtree('rattail_mailchimp.egg-info')
     c.run('python -m build --sdist')
 
-    filename = f'rattail_mailchimp-{__version__}.tar.gz'
-    c.run('twine upload dist/{}'.format(filename))
+    c.run('twine upload dist/*')