diff --git a/CHANGELOG.md b/CHANGELOG.md index dafe9f3..9009e56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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 diff --git a/README.md b/README.md new file mode 100644 index 0000000..5b17139 --- /dev/null +++ b/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. diff --git a/README.rst b/README.rst deleted file mode 100644 index 25dc9c3..0000000 --- a/README.rst +++ /dev/null @@ -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/ diff --git a/pyproject.toml b/pyproject.toml index 1c88935..335d26c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,9 @@ build-backend = "hatchling.build" [project] name = "rattail-mailchimp" -version = "0.3.2" +version = "0.3.3" description = "Rattail Software Interfaces for MailChimp" -readme = "README.rst" +readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ diff --git a/rattail_mailchimp/config.py b/rattail_mailchimp/config.py index 9005b78..4bad837 100644 --- a/rattail_mailchimp/config.py +++ b/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 """ diff --git a/rattail_mailchimp/importing/mailchimp.py b/rattail_mailchimp/importing/mailchimp.py index 6c194fb..c5f9a35 100644 --- a/rattail_mailchimp/importing/mailchimp.py +++ b/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'], }