From e6380b96e2c10b43a2e789c7adbfa8ebf5039eea Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Sat, 6 Aug 2022 13:52:21 -0400 Subject: [PATCH] bumped version to v1.0.0 --- apprise/__init__.py | 2 +- apprise/i18n/apprise.pot | 16 +++----- .../redhat/apprise-click67-support.patch | 39 +++++++++++++++++++ packaging/redhat/apprise-rhel7-support.patch | 28 ++++++------- packaging/redhat/python-apprise.spec | 20 +++++++++- setup.py | 2 +- 6 files changed, 79 insertions(+), 28 deletions(-) create mode 100644 packaging/redhat/apprise-click67-support.patch diff --git a/apprise/__init__.py b/apprise/__init__.py index bb991a7d..f7254119 100644 --- a/apprise/__init__.py +++ b/apprise/__init__.py @@ -24,7 +24,7 @@ # THE SOFTWARE. __title__ = 'Apprise' -__version__ = '0.9.9' +__version__ = '1.0.0' __author__ = 'Chris Caron' __license__ = 'MIT' __copywrite__ = 'Copyright (C) 2022 Chris Caron ' diff --git a/apprise/i18n/apprise.pot b/apprise/i18n/apprise.pot index 2a0b73f2..859bc0f2 100644 --- a/apprise/i18n/apprise.pot +++ b/apprise/i18n/apprise.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apprise 0.9.9\n" +"Project-Id-Version: apprise 1.0.0\n" "Report-Msgid-Bugs-To: lead2gold@gmail.com\n" -"POT-Creation-Date: 2022-06-02 20:20-0400\n" +"POT-Creation-Date: 2022-08-06 13:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -499,9 +499,6 @@ msgstr "" msgid "Source Email" msgstr "" -msgid "Source JID" -msgstr "" - msgid "Source Phone No" msgstr "" @@ -553,9 +550,6 @@ msgstr "" msgid "Target Group ID" msgstr "" -msgid "Target JID" -msgstr "" - msgid "Target Phone No" msgstr "" @@ -622,6 +616,9 @@ msgstr "" msgid "Text To Speech" msgstr "" +msgid "Thread ID" +msgstr "" + msgid "To Channel ID" msgstr "" @@ -718,9 +715,6 @@ msgstr "" msgid "X-Axis" msgstr "" -msgid "XEP" -msgstr "" - msgid "Y-Axis" msgstr "" diff --git a/packaging/redhat/apprise-click67-support.patch b/packaging/redhat/apprise-click67-support.patch new file mode 100644 index 00000000..fa9079f7 --- /dev/null +++ b/packaging/redhat/apprise-click67-support.patch @@ -0,0 +1,39 @@ +diff -Naur apprise-1.0.0/test/test_cli.py apprise-1.0.0.patched/test/test_cli.py +--- apprise-1.0.0/test/test_cli.py 2022-07-15 14:52:13.000000000 -0400 ++++ apprise-1.0.0.patched/test/test_cli.py 2022-08-06 13:32:50.796935607 -0400 +@@ -1022,9 +1022,6 @@ + # Absolute path to __init__.py is okay + assert result.exit_code == 0 + +- # we can verify that it prepares our message +- assert result.stdout.strip() == 'info: - test body' +- + # Clear our working variables so they don't obstruct the next test + # This simulates an actual call from the CLI. Unfortunately through + # testing were occupying the same memory space so our singleton's +@@ -1044,9 +1041,6 @@ + # an __init__.py is found on the inside of it + assert result.exit_code == 0 + +- # we can verify that it prepares our message +- assert result.stdout.strip() == 'info: - test body' +- + # Test double paths that are the same; this ensures we only + # load the plugin once + result = runner.invoke(cli.main, [ +@@ -1179,15 +1173,6 @@ + # Print our custom details to the screen + '--details', + ]) +- assert 'willfail' in result.stdout +- assert 'always failing...' in result.stdout +- +- assert 'clihook1' in result.stdout +- assert 'the original clihook entry' in result.stdout +- assert 'a duplicate of the clihook entry' not in result.stdout +- +- assert 'clihook2' in result.stdout +- assert 'Custom - clihook2' in result.stdout + + # Note that the failure of the decorator carries all the way back + # to the CLI diff --git a/packaging/redhat/apprise-rhel7-support.patch b/packaging/redhat/apprise-rhel7-support.patch index e63bbe34..464346ce 100644 --- a/packaging/redhat/apprise-rhel7-support.patch +++ b/packaging/redhat/apprise-rhel7-support.patch @@ -1,6 +1,6 @@ -diff -Naur apprise-0.9.6/test/helpers/rest.py apprise-0.9.6.patched/test/helpers/rest.py ---- apprise-0.9.6/test/helpers/rest.py 2021-12-01 20:00:27.000000000 -0500 -+++ apprise-0.9.6.patched/test/helpers/rest.py 2021-12-02 15:05:54.957547670 -0500 +diff -Naur apprise-1.0.0/test/helpers/rest.py apprise-1.0.0.patched/test/helpers/rest.py +--- apprise-1.0.0/test/helpers/rest.py 2022-07-01 11:37:34.000000000 -0400 ++++ apprise-1.0.0.patched/test/helpers/rest.py 2022-08-06 13:30:29.187325564 -0400 @@ -54,8 +54,6 @@ 0, 'requests.RequestException() not handled'), requests.HTTPError( @@ -10,9 +10,9 @@ diff -Naur apprise-0.9.6/test/helpers/rest.py apprise-0.9.6.patched/test/helpers requests.TooManyRedirects( 0, 'requests.TooManyRedirects() not handled'), ) -diff -Naur apprise-0.9.6/test/test_attach_http.py apprise-0.9.6.patched/test/test_attach_http.py ---- apprise-0.9.6/test/test_attach_http.py 2021-12-01 20:00:27.000000000 -0500 -+++ apprise-0.9.6.patched/test/test_attach_http.py 2021-12-02 15:05:48.165575030 -0500 +diff -Naur apprise-1.0.0/test/test_attach_http.py apprise-1.0.0.patched/test/test_attach_http.py +--- apprise-1.0.0/test/test_attach_http.py 2022-07-15 14:52:13.000000000 -0400 ++++ apprise-1.0.0.patched/test/test_attach_http.py 2022-08-06 13:30:29.188325562 -0400 @@ -51,8 +51,6 @@ 0, 'requests.RequestException() not handled'), requests.HTTPError( @@ -22,9 +22,9 @@ diff -Naur apprise-0.9.6/test/test_attach_http.py apprise-0.9.6.patched/test/tes requests.TooManyRedirects( 0, 'requests.TooManyRedirects() not handled'), -diff -Naur apprise-0.9.6/test/test_config_http.py apprise-0.9.6.patched/test/test_config_http.py ---- apprise-0.9.6/test/test_config_http.py 2021-12-01 20:00:27.000000000 -0500 -+++ apprise-0.9.6.patched/test/test_config_http.py 2021-12-02 15:06:01.927519591 -0500 +diff -Naur apprise-1.0.0/test/test_config_http.py apprise-1.0.0.patched/test/test_config_http.py +--- apprise-1.0.0/test/test_config_http.py 2022-07-15 14:52:13.000000000 -0400 ++++ apprise-1.0.0.patched/test/test_config_http.py 2022-08-06 13:30:29.188325562 -0400 @@ -46,8 +46,6 @@ 0, 'requests.RequestException() not handled'), requests.HTTPError( @@ -34,10 +34,10 @@ diff -Naur apprise-0.9.6/test/test_config_http.py apprise-0.9.6.patched/test/tes requests.TooManyRedirects( 0, 'requests.TooManyRedirects() not handled'), ) -diff -Naur apprise-0.9.6/test/test_plugin_glib.py apprise-0.9.6.patched/test/test_plugin_glib.py ---- apprise-0.9.6/test/test_plugin_glib.py 2021-12-01 20:00:27.000000000 -0500 -+++ apprise-0.9.6.patched/test/test_plugin_glib.py 2021-12-02 15:06:40.823362895 -0500 -@@ -48,7 +48,7 @@ +diff -Naur apprise-1.0.0/test/test_plugin_glib.py apprise-1.0.0.patched/test/test_plugin_glib.py +--- apprise-1.0.0/test/test_plugin_glib.py 2022-07-15 14:52:13.000000000 -0400 ++++ apprise-1.0.0.patched/test/test_plugin_glib.py 2022-08-06 13:30:29.189325559 -0400 +@@ -49,7 +49,7 @@ if 'dbus' not in sys.modules: # Environment doesn't allow for dbus @@ -45,4 +45,4 @@ diff -Naur apprise-0.9.6/test/test_plugin_glib.py apprise-0.9.6.patched/test/tes + pytest.skip("Skipping dbus-python based tests") from dbus import DBusException # noqa E402 - + from apprise.plugins.NotifyDBus import DBusUrgency # noqa E402 diff --git a/packaging/redhat/python-apprise.spec b/packaging/redhat/python-apprise.spec index 763c7119..9f9d54c6 100644 --- a/packaging/redhat/python-apprise.spec +++ b/packaging/redhat/python-apprise.spec @@ -59,7 +59,7 @@ SMTP2Go, Spontit, SparkPost, Super Toasty, Streamlabs, Stride, Syslog, Techulus Push, Telegram, Twilio, Twitter, Twist, XBMC, Vonage, Webex Teams} Name: python-%{pypi_name} -Version: 0.9.9 +Version: 1.0.0 Release: 1%{?dist} Summary: A simple wrapper to many popular notification services used today License: MIT @@ -69,6 +69,10 @@ Source0: %{url}/archive/v%{version}/%{pypi_name}-%{version}.tar.gz # correctly handle test coverage. It also removes reference to a # extra check not supported in py.test in EPEL7 builds Patch0: %{pypi_name}-rhel7-support.patch +# CentOS/Rocky 7 and 8 ship with Click v6.7 which does not support the .stdout +# directive used in the unit testing. This patch just makes it so our package +# continues to be compatible with these linux distributions +Patch1: %{pypi_name}-click67-support.patch BuildArch: noarch %description %{common_description} @@ -174,6 +178,11 @@ BuildRequires: python%{python3_pkgversion}-pytest-runner rm -f apprise/py3compat/asyncio.py %endif +%if 0%{?rhel} && 0%{?rhel} <= 8 +# click v6.7 unit testing support +%patch1 -p1 +%endif + %build %if 0%{?with_python2} %py2_build @@ -234,6 +243,15 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version %endif %changelog +* Sat Aug 6 2022 Chris Caron - 1.0.0-1 +- Updated to v1.0.0 + +* Fri Jul 22 2022 Fedora Release Engineering - 0.9.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jun 15 2022 Python Maint - 0.9.9-2 +- Rebuilt for Python 3.11 + * Thu Jun 2 2022 Chris Caron - 0.9.9-1 - Updated to v0.9.9 diff --git a/setup.py b/setup.py index fc75d36f..7fbb4925 100755 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ else: setup( name='apprise', - version='0.9.9', + version='1.0.0', description='Push Notifications that work with just about every platform!', license='MIT', long_description=open('README.md').read(),