From 8cf638ca9b0b31f4d40f5f6a0123be8572000532 Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Wed, 2 Sep 2020 07:54:40 -0400 Subject: [PATCH] bumped version to v0.8.8 --- apprise/__init__.py | 2 +- apprise/i18n/apprise.pot | 7 +++- packaging/redhat/python-apprise.spec | 7 +++- setup.py | 2 +- test/test_config_base.py | 57 ++++++++++++++++++---------- 5 files changed, 50 insertions(+), 25 deletions(-) diff --git a/apprise/__init__.py b/apprise/__init__.py index 71c28413..a2511d28 100644 --- a/apprise/__init__.py +++ b/apprise/__init__.py @@ -24,7 +24,7 @@ # THE SOFTWARE. __title__ = 'apprise' -__version__ = '0.8.7' +__version__ = '0.8.8' __author__ = 'Chris Caron' __license__ = 'MIT' __copywrite__ = 'Copyright (C) 2020 Chris Caron ' diff --git a/apprise/i18n/apprise.pot b/apprise/i18n/apprise.pot index 15bad6b2..2a0dc5e0 100644 --- a/apprise/i18n/apprise.pot +++ b/apprise/i18n/apprise.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apprise 0.8.7\n" +"Project-Id-Version: apprise 0.8.8\n" "Report-Msgid-Bugs-To: lead2gold@gmail.com\n" -"POT-Creation-Date: 2020-08-13 17:07-0400\n" +"POT-Creation-Date: 2020-09-02 07:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -104,6 +104,9 @@ msgstr "" msgid "Country" msgstr "" +msgid "Custom Icon" +msgstr "" + msgid "Cycles" msgstr "" diff --git a/packaging/redhat/python-apprise.spec b/packaging/redhat/python-apprise.spec index ea9bd0eb..98ac07fe 100644 --- a/packaging/redhat/python-apprise.spec +++ b/packaging/redhat/python-apprise.spec @@ -56,7 +56,7 @@ Sinch, Slack, Spontit, Super Toasty, Stride, Syslog, Techulus Push, Telegram, Twilio, Twitter, Twist, XBMC, XMPP, Webex Teams} Name: python-%{pypi_name} -Version: 0.8.7 +Version: 0.8.8 Release: 1%{?dist} Summary: A simple wrapper to many popular notification services used today License: MIT @@ -175,6 +175,8 @@ BuildRequires: python%{python3_pkgversion}-pytest-runner %if 0%{?rhel} && 0%{?rhel} <= 7 # rhel7 older package work-arounds %patch0 -p1 +# rhel7 doesn't like the new asyncio syntax +rm -f apprise/py3compat/asyncio.py %endif %build @@ -237,6 +239,9 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version %endif %changelog +* Wed Sep 2 2020 Chris Caron - 0.8.8-1 +- Updated to v0.8.8 + * Thu Aug 13 2020 Chris Caron - 0.8.7-1 - Updated to v0.8.7 diff --git a/setup.py b/setup.py index b64de5d7..799cad94 100755 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ else: setup( name='apprise', - version='0.8.7', + version='0.8.8', description='Push Notifications that work with just about every platform!', license='MIT', long_description=open('README.md').read(), diff --git a/test/test_config_base.py b/test/test_config_base.py index 8ab6f301..74c6949a 100644 --- a/test/test_config_base.py +++ b/test/test_config_base.py @@ -28,6 +28,7 @@ import pytest from apprise.AppriseAsset import AppriseAsset from apprise.config.ConfigBase import ConfigBase from apprise import ConfigFormat +import yaml # Disable logging for a cleaner testing output import logging @@ -490,26 +491,6 @@ urls: # There were no include entries defined assert len(config) == 0 - # Invalid url/schema - result, config = ConfigBase.config_parse_yaml(""" -# no lists... just no -urls: [milk, pumpkin pie, eggs, juice] - -# Including by list is okay -include: [file:///absolute/path/, relative/path, http://test.com] - -""", asset=asset) - - # Invalid data gets us an empty result set - assert isinstance(result, list) - assert len(result) == 0 - - # There were 3 include entries - assert len(config) == 3 - assert 'file:///absolute/path/' in config - assert 'relative/path' in config - assert 'http://test.com' in config - # Invalid url/schema result, config = ConfigBase.config_parse_yaml(""" urls: @@ -906,3 +887,39 @@ include: assert 'http://localhost/apprise/cfg01' in config assert 'http://localhost/apprise/cfg02' in config assert 'http://localhost/apprise/cfg03' in config + + +# This test fails on CentOS 8.x so it was moved into it's own function +# so it could be bypassed. The ability to use lists in YAML files didn't +# appear to happen until later on; it's certainly not available in v3.12 +# which was what shipped with CentOS v8 at the time. +@pytest.mark.skipif(int(yaml.__version__.split('.')[0]) <= 3, + reason="requires pyaml v4.x or higher.") +def test_config_base_config_parse_yaml_list(): + """ + API: ConfigBase.config_parse_yaml list parsing + + """ + + # general reference used below + asset = AppriseAsset() + + # Invalid url/schema + result, config = ConfigBase.config_parse_yaml(""" +# no lists... just no +urls: [milk, pumpkin pie, eggs, juice] + +# Including by list is okay +include: [file:///absolute/path/, relative/path, http://test.com] + +""", asset=asset) + + # Invalid data gets us an empty result set + assert isinstance(result, list) + assert len(result) == 0 + + # There were 3 include entries + assert len(config) == 3 + assert 'file:///absolute/path/' in config + assert 'relative/path' in config + assert 'http://test.com' in config