diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 037acf9..2e2d634 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.10.0 +current_version = 1.11.0 commit = True tag = False diff --git a/HISTORY.rst b/HISTORY.rst index 6d507ff..662dc78 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -15,6 +15,11 @@ Recent History .. Next Release .. ------------------ +1.11.0 (2021-09-13) +------------------ + +* Make "Add new guests to contacts list only if email entered" the default for Wild Apricot events. + 1.10.0 (2021-08-18) ------------------ diff --git a/meetup2apricot/__init__.py b/meetup2apricot/__init__.py index 84097d7..ba9ac1f 100644 --- a/meetup2apricot/__init__.py +++ b/meetup2apricot/__init__.py @@ -4,4 +4,4 @@ __author__ = """Joel Shprentz""" __email__ = "jshprentz@his.com" -__version__ = "1.10.0" +__version__ = "1.11.0" diff --git a/meetup2apricot/event_processor.py b/meetup2apricot/event_processor.py index de76e86..0357c23 100644 --- a/meetup2apricot/event_processor.py +++ b/meetup2apricot/event_processor.py @@ -52,12 +52,12 @@ def process(self, meetup_event): photo_path = self.copy_photo(meetup_event) except (PhotoRetrieveError, PhotoUploadError) as err: self.logger.warning( - "skipping %s: %s at %s", + "skipping %s: %s at %s\n%s", meetup_event.meetup_id, meetup_event.name, f"{meetup_event.start_time:%Y-%m-%d %H:%M}", + err, ) - self.logger.warning(err) return event_tags = self.get_event_tags(meetup_event) apricot_event_id = self.add_apricot_event(meetup_event, photo_path, event_tags) diff --git a/meetup2apricot/meetup_to_apricot_event_adaptor.py b/meetup2apricot/meetup_to_apricot_event_adaptor.py index 6b479a9..d08c1e2 100644 --- a/meetup2apricot/meetup_to_apricot_event_adaptor.py +++ b/meetup2apricot/meetup_to_apricot_event_adaptor.py @@ -137,6 +137,9 @@ def for_json(self): "AvailableForAnyLevel": True, "AvailableForAnyGroup": True, }, + "GuestRegistrationSettings": { + "CreateContactMode": "CreateContactForGuestsWithEmail" + }, "PaymentMethod": "OnlineOnly", "RegistrationConfirmationExtraInfo": self.extra_info, "IsWaitlistEnabled": False, diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index c4726e9..c3b87d9 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -6,13 +6,11 @@ # alabaster==0.7.12 # via sphinx -appdirs==1.4.4 - # via black babel==2.9.1 # via sphinx -black==21.7b0 +black==21.8b0 # via -r dev-requirements.in -bleach==4.0.0 +bleach==4.1.0 # via readme-renderer bump2version==1.0.1 # via -r dev-requirements.in @@ -30,7 +28,7 @@ click==8.0.1 # via black colorama==0.4.4 # via twine -cryptography==3.4.7 +cryptography==3.4.8 # via secretstorage docutils==0.17.1 # via @@ -42,7 +40,7 @@ idna==3.2 # requests imagesize==1.2.0 # via sphinx -importlib-metadata==4.6.4 +importlib-metadata==4.8.1 # via # keyring # twine @@ -52,7 +50,7 @@ jeepney==0.7.1 # secretstorage jinja2==3.0.1 # via sphinx -keyring==23.1.0 +keyring==23.2.1 # via twine markupsafe==2.0.1 # via jinja2 @@ -67,6 +65,10 @@ pathspec==0.9.0 # via black pkginfo==1.7.1 # via twine +platformdirs==2.3.0 + # via + # -c test-requirements.txt + # black pycparser==2.20 # via cffi pygments==2.10.0 @@ -77,13 +79,13 @@ pyparsing==2.4.7 # via # -c test-requirements.txt # packaging -pysnooper==0.5.0 +pysnooper==1.0.0 # via -r dev-requirements.in pytz==2021.1 # via babel readme-renderer==29.0 # via twine -regex==2021.8.3 +regex==2021.8.28 # via black requests==2.26.0 # via @@ -106,7 +108,7 @@ six==1.16.0 # readme-renderer snowballstemmer==2.1.0 # via sphinx -sphinx==4.1.2 +sphinx==4.2.0 # via -r dev-requirements.in sphinxcontrib-applehelp==1.0.2 # via sphinx @@ -122,15 +124,17 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx tomli==1.2.1 # via black -tqdm==4.62.1 +tqdm==4.62.2 # via twine twine==3.4.2 # via -r dev-requirements.in +typing-extensions==3.10.0.2 + # via black urllib3==1.26.6 # via # -c requirements.txt # requests -watchdog==2.1.3 +watchdog==2.1.5 # via -r dev-requirements.in webencodings==0.5.1 # via bleach diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 1925eba..eb7b6a5 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -26,9 +26,9 @@ packaging==21.0 # via # pytest # tox -platformdirs==2.2.0 +platformdirs==2.3.0 # via virtualenv -pluggy==0.13.1 +pluggy==1.0.0 # via # pytest # tox @@ -42,7 +42,7 @@ pyflakes==2.3.1 # via flake8 pyparsing==2.4.7 # via packaging -pytest==6.2.4 +pytest==6.2.5 # via # -r test-requirements.in # pytest-mock @@ -58,7 +58,7 @@ toml==0.10.2 # via # pytest # tox -tox==3.24.1 +tox==3.24.3 # via -r test-requirements.in virtualenv==20.7.2 # via tox diff --git a/setup.py b/setup.py index fa7c97b..51c956d 100644 --- a/setup.py +++ b/setup.py @@ -57,6 +57,6 @@ test_suite="tests", tests_require=test_requirements, url="https://github.com/jshprentz/meetup2apricot", - version="1.10.0", + version="1.11.0", zip_safe=False, ) diff --git a/tests/sample_apricot_json.py b/tests/sample_apricot_json.py index fc79a8d..c4ebcdb 100644 --- a/tests/sample_apricot_json.py +++ b/tests/sample_apricot_json.py @@ -37,6 +37,9 @@ "AvailableForAnyLevel": True, "AvailableForAnyGroup": True, }, + "GuestRegistrationSettings": { + "CreateContactMode": "CreateContactForGuestsWithEmail" + }, "PaymentMethod": "OnlineOnly", "RegistrationConfirmationExtraInfo": "How to find us: " "https://zoom.us/j/92758362882?pwd=a2VJOGxyOTBqelNhdjY1dGpqZStjZz09", @@ -76,6 +79,9 @@ "VisibleTo": "Members", }, "DescriptionHtml": EXPECTED_PAID_DESCRIPTION_HTML, + "GuestRegistrationSettings": { + "CreateContactMode": "CreateContactForGuestsWithEmail" + }, "IsWaitlistEnabled": False, "PaymentMethod": "OnlineOnly", "RegistrationConfirmationExtraInfo": "",