github
/
apprise
mirror of https://github.com/caronc/apprise
1
0
Fork 0
Code Issues Releases Wiki Activity

bumped version to v0.8.2

pull/181/head v0.8.2
Chris Caron 2019-11-25 18:51:55 -05:00
parent d34a995bb0
commit 49cb8bee37
5 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apprise/__init__.py
View File

@ -24,7 +24,7 @@
# THE SOFTWARE. # THE SOFTWARE.
__title__ = 'apprise' __title__ = 'apprise'
__version__ = '0.8.1' __version__ = '0.8.2'
__author__ = 'Chris Caron' __author__ = 'Chris Caron'
__license__ = 'MIT' __license__ = 'MIT'
__copywrite__ = 'Copyright (C) 2019 Chris Caron <lead2gold@gmail.com>' __copywrite__ = 'Copyright (C) 2019 Chris Caron <lead2gold@gmail.com>'

16
apprise/i18n/apprise.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: apprise 0.8.1\n" "Project-Id-Version: apprise 0.8.2\n"
"Report-Msgid-Bugs-To: lead2gold@gmail.com\n" "Report-Msgid-Bugs-To: lead2gold@gmail.com\n"
"POT-Creation-Date: 2019-10-13 21:39-0400\n" "POT-Creation-Date: 2019-11-25 18:50-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -149,9 +149,15 @@ msgstr ""
msgid "IRC Colors" msgid "IRC Colors"
msgstr "" msgstr ""
msgid "Include Footer"
msgstr ""
msgid "Include Image" msgid "Include Image"
msgstr "" msgstr ""
msgid "Local File"
msgstr ""
msgid "Log PID" msgid "Log PID"
msgstr "" msgstr ""
@ -170,6 +176,9 @@ msgstr ""
msgid "Notify Format" msgid "Notify Format"
msgstr "" msgstr ""
msgid "OAuth Access Token"
msgstr ""
msgid "Organization" msgid "Organization"
msgstr "" msgstr ""
@ -356,6 +365,9 @@ msgstr ""
msgid "Version" msgid "Version"
msgstr "" msgstr ""
msgid "Web Based"
msgstr ""
msgid "Webhook" msgid "Webhook"
msgstr "" msgstr ""

38
packaging/redhat/apprise-rhel7-support.patch
View File

@ -1,7 +1,19 @@
diff -Naur apprise-0.7.4/test/test_config_http.py apprise-0.7.4-patched/test/test_config_http.py diff -Naur apprise-0.8.2/test/test_attach_http.py apprise-0.8.2-patched/test/test_attach_http.py
--- apprise-0.7.4/test/test_config_http.py 2019-03-05 19:39:56.000000000 -0500 --- apprise-0.8.2/test/test_attach_http.py 2019-11-17 08:07:36.000000000 -0500
+++ apprise-0.7.4-patched/test/test_config_http.py 2019-03-12 18:58:01.796635838 -0400 +++ apprise-0.8.2-patched/test/test_attach_http.py 2019-11-25 19:06:33.350512555 -0500
@@ -44,8 +44,6 @@ @@ -50,8 +50,6 @@
0, 'requests.RequestException() not handled'),
requests.HTTPError(
0, 'requests.HTTPError() not handled'),
- requests.ReadTimeout(
- 0, 'requests.ReadTimeout() not handled'),
requests.TooManyRedirects(
0, 'requests.TooManyRedirects() not handled'),
diff -Naur apprise-0.8.2/test/test_config_http.py apprise-0.8.2-patched/test/test_config_http.py
--- apprise-0.8.2/test/test_config_http.py 2019-11-21 17:00:14.000000000 -0500
+++ apprise-0.8.2-patched/test/test_config_http.py 2019-11-25 19:06:35.454513337 -0500
@@ -46,8 +46,6 @@
0, 'requests.RequestException() not handled'), 0, 'requests.RequestException() not handled'),
requests.HTTPError( requests.HTTPError(
0, 'requests.HTTPError() not handled'), 0, 'requests.HTTPError() not handled'),
@ -10,22 +22,22 @@ diff -Naur apprise-0.7.4/test/test_config_http.py apprise-0.7.4-patched/test/tes
requests.TooManyRedirects( requests.TooManyRedirects(
0, 'requests.TooManyRedirects() not handled'), 0, 'requests.TooManyRedirects() not handled'),
) )
diff -Naur apprise-0.7.4/test/test_glib_plugin.py apprise-0.7.4-patched/test/test_glib_plugin.py diff -Naur apprise-0.8.2/test/test_glib_plugin.py apprise-0.8.2-patched/test/test_glib_plugin.py
--- apprise-0.7.4/test/test_glib_plugin.py 2019-03-05 19:39:56.000000000 -0500 --- apprise-0.8.2/test/test_glib_plugin.py 2019-10-29 19:55:24.000000000 -0400
+++ apprise-0.7.4-patched/test/test_glib_plugin.py 2019-03-12 18:59:32.764545807 -0400 +++ apprise-0.8.2-patched/test/test_glib_plugin.py 2019-11-25 19:05:56.822498971 -0500
@@ -47,7 +47,7 @@ @@ -48,7 +48,7 @@
if 'dbus' not in sys.modules: if 'dbus' not in sys.modules:
# Environment doesn't allow for dbus # Environment doesn't allow for dbus
- pytest.skip("Skipping dbus-python based tests", allow_module_level=True) - pytest.skip("Skipping dbus-python based tests", allow_module_level=True)
+ pytest.skip("Skipping dbus-python based tests") + pytest.skip("Skipping dbus-python based tests")
from dbus import DBusException # noqa E402
@mock.patch('dbus.SessionBus') diff -Naur apprise-0.8.2/test/test_rest_plugins.py apprise-0.8.2-patched/test/test_rest_plugins.py
diff -Naur apprise-0.7.4/test/test_rest_plugins.py apprise-0.7.4-patched/test/test_rest_plugins.py --- apprise-0.8.2/test/test_rest_plugins.py 2019-11-24 13:43:28.000000000 -0500
--- apprise-0.7.4/test/test_rest_plugins.py 2019-03-10 14:28:40.000000000 -0400 +++ apprise-0.8.2-patched/test/test_rest_plugins.py 2019-11-25 19:06:38.337514409 -0500
+++ apprise-0.7.4-patched/test/test_rest_plugins.py 2019-03-12 18:58:08.538542247 -0400 @@ -57,8 +57,6 @@
@@ -51,8 +51,6 @@
0, 'requests.RequestException() not handled'), 0, 'requests.RequestException() not handled'),
requests.HTTPError( requests.HTTPError(
0, 'requests.HTTPError() not handled'), 0, 'requests.HTTPError() not handled'),

51
packaging/redhat/python-apprise.spec
View File

@ -27,18 +27,18 @@
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
# Python v2 Support dropped # Python v2 Support dropped
%global with_python2 0 %global with_python2 0
%endif # fedora and/or rhel7 %endif
%if 0%{?_module_build} %if 0%{?_module_build}
%bcond_with tests %bcond_with tests
%else %else
# When bootstrapping Python, we cannot test this yet # When bootstrapping Python, we cannot test this yet
%bcond_without tests %bcond_without tests
%endif # module_build %endif
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
%global with_python3 0 %global with_python3 0
%endif # using rhel7 %endif
%global pypi_name apprise %global pypi_name apprise
@ -55,7 +55,7 @@ SendGrid, SimplePush, Slack, Super Toasty, Stride, Syslog, Techulus Push,
Telegram, Twilio, Twitter, Twist, XBMC, XMPP, Webex Teams} Telegram, Twilio, Twitter, Twist, XBMC, XMPP, Webex Teams}
Name: python-%{pypi_name} Name: python-%{pypi_name}
Version: 0.8.1 Version: 0.8.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: A simple wrapper to many popular notification services used today Summary: A simple wrapper to many popular notification services used today
License: MIT License: MIT
@ -86,7 +86,7 @@ BuildRequires: python-yaml
%else %else
BuildRequires: python2-babel BuildRequires: python2-babel
BuildRequires: python2-yaml BuildRequires: python2-yaml
%endif # using rhel7 %endif
Requires: python-requests Requires: python-requests
Requires: python2-requests-oauthlib Requires: python2-requests-oauthlib
@ -96,17 +96,17 @@ Requires: python-markdown
Requires: python-yaml Requires: python-yaml
%else %else
Requires: python2-yaml Requires: python2-yaml
%endif # using rhel7 %endif
%if %{with tests} %if %{with tests}
BuildRequires: python-mock BuildRequires: python-mock
BuildRequires: python2-pytest-runner BuildRequires: python2-pytest-runner
BuildRequires: python2-pytest BuildRequires: python2-pytest
%endif # with_tests %endif
%description -n python2-%{pypi_name} %{common_description} %description -n python2-%{pypi_name} %{common_description}
%endif # with_python2 %endif
%package -n %{pypi_name} %package -n %{pypi_name}
Summary: Apprise CLI Tool Summary: Apprise CLI Tool
@ -114,12 +114,12 @@ Summary: Apprise CLI Tool
%if 0%{?with_python3} %if 0%{?with_python3}
Requires: python%{python3_pkgversion}-click >= 5.0 Requires: python%{python3_pkgversion}-click >= 5.0
Requires: python%{python3_pkgversion}-%{pypi_name} = %{version}-%{release} Requires: python%{python3_pkgversion}-%{pypi_name} = %{version}-%{release}
%endif # with_python3 %endif
%if 0%{?with_python2} %if 0%{?with_python2}
Requires: python2-click >= 5.0 Requires: python2-click >= 5.0
Requires: python2-%{pypi_name} = %{version}-%{release} Requires: python2-%{pypi_name} = %{version}-%{release}
%endif # with_python2 %endif
%description -n %{pypi_name} %description -n %{pypi_name}
An accompanied CLI tool that can be used as part of Apprise An accompanied CLI tool that can be used as part of Apprise
@ -149,33 +149,33 @@ Requires: python%{python3_pkgversion}-yaml
BuildRequires: python%{python3_pkgversion}-mock BuildRequires: python%{python3_pkgversion}-mock
BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest
BuildRequires: python%{python3_pkgversion}-pytest-runner BuildRequires: python%{python3_pkgversion}-pytest-runner
%endif # with_tests %endif
%description -n python%{python3_pkgversion}-%{pypi_name} %{common_description} %description -n python%{python3_pkgversion}-%{pypi_name} %{common_description}
%endif # with_python3 %endif
%prep %prep
%setup -q -n %{pypi_name}-%{version} %setup -q -n %{pypi_name}-%{version}
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
# rhel7 older package work-arounds # rhel7 older package work-arounds
%patch0 -p1 %patch0 -p1
%endif # using rhel7 %endif
%build %build
%if 0%{?with_python2} %if 0%{?with_python2}
%py2_build %py2_build
%endif # with_python2 %endif
%if 0%{?with_python3} %if 0%{?with_python3}
%py3_build %py3_build
%endif # with_python3 %endif
%install %install
%if 0%{?with_python2} %if 0%{?with_python2}
%py2_install %py2_install
%endif # with_python2 %endif
%if 0%{?with_python3} %if 0%{?with_python3}
%py3_install %py3_install
%endif # with_python3 %endif
install -p -D -T -m 0644 packaging/man/%{pypi_name}.1 \ install -p -D -T -m 0644 packaging/man/%{pypi_name}.1 \
%{buildroot}%{_mandir}/man1/%{pypi_name}.1 %{buildroot}%{_mandir}/man1/%{pypi_name}.1
@ -184,11 +184,11 @@ install -p -D -T -m 0644 packaging/man/%{pypi_name}.1 \
%check %check
%if 0%{?with_python2} %if 0%{?with_python2}
LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python2_sitelib} py.test LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python2_sitelib} py.test
%endif # with_python2 %endif
%if 0%{?with_python3} %if 0%{?with_python3}
LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version}
%endif # with_python3 %endif
%endif # with_tests %endif
%if 0%{?with_python2} %if 0%{?with_python2}
%files -n python2-%{pypi_name} %files -n python2-%{pypi_name}
@ -197,7 +197,7 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
%{python2_sitelib}/%{pypi_name} %{python2_sitelib}/%{pypi_name}
%exclude %{python2_sitelib}/%{pypi_name}/cli.* %exclude %{python2_sitelib}/%{pypi_name}/cli.*
%{python2_sitelib}/*.egg-info %{python2_sitelib}/*.egg-info
%endif # with_python2 %endif
%if 0%{?with_python3} %if 0%{?with_python3}
%files -n python%{python3_pkgversion}-%{pypi_name} %files -n python%{python3_pkgversion}-%{pypi_name}
@ -206,7 +206,7 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
%{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}
%exclude %{python3_sitelib}/%{pypi_name}/cli.* %exclude %{python3_sitelib}/%{pypi_name}/cli.*
%{python3_sitelib}/*.egg-info %{python3_sitelib}/*.egg-info
%endif # with_python3 %endif
%files -n %{pypi_name} %files -n %{pypi_name}
%{_bindir}/%{pypi_name} %{_bindir}/%{pypi_name}
@ -214,13 +214,16 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
%if 0%{?with_python3} %if 0%{?with_python3}
%{python3_sitelib}/%{pypi_name}/cli.* %{python3_sitelib}/%{pypi_name}/cli.*
%endif # with_python3 %endif
%if 0%{?with_python2} %if 0%{?with_python2}
%{python2_sitelib}/%{pypi_name}/cli.* %{python2_sitelib}/%{pypi_name}/cli.*
%endif # with_python2 %endif
%changelog %changelog
* Mon Nov 25 2019 Chris Caron <lead2gold@gmail.com> - 0.8.2-1
- Updated to v0.8.2
* Sun Oct 13 2019 Chris Caron <lead2gold@gmail.com> - 0.8.1-1 * Sun Oct 13 2019 Chris Caron <lead2gold@gmail.com> - 0.8.1-1
- Updated to v0.8.1 - Updated to v0.8.1

2
setup.py
View File

@ -62,7 +62,7 @@ else:
setup( setup(
name='apprise', name='apprise',
version='0.8.1', version='0.8.2',
description='Push Notifications that work with just about every platform!', description='Push Notifications that work with just about every platform!',
license='MIT', license='MIT',
long_description=open('README.md').read(), long_description=open('README.md').read(),