Skip to content

Commit

Permalink
bumped version to v0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
caronc committed Nov 26, 2019
1 parent d34a995 commit 49cb8be
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 41 deletions.
2 changes: 1 addition & 1 deletion apprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# THE SOFTWARE.

__title__ = 'apprise'
__version__ = '0.8.1'
__version__ = '0.8.2'
__author__ = 'Chris Caron'
__license__ = 'MIT'
__copywrite__ = 'Copyright (C) 2019 Chris Caron <lead2gold@gmail.com>'
Expand Down
16 changes: 14 additions & 2 deletions apprise/i18n/apprise.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#, fuzzy
msgid ""
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"
"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"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -149,9 +149,15 @@ msgstr ""
msgid "IRC Colors"
msgstr ""

msgid "Include Footer"
msgstr ""

msgid "Include Image"
msgstr ""

msgid "Local File"
msgstr ""

msgid "Log PID"
msgstr ""

Expand All @@ -170,6 +176,9 @@ msgstr ""
msgid "Notify Format"
msgstr ""

msgid "OAuth Access Token"
msgstr ""

msgid "Organization"
msgstr ""

Expand Down Expand Up @@ -356,6 +365,9 @@ msgstr ""
msgid "Version"
msgstr ""

msgid "Web Based"
msgstr ""

msgid "Webhook"
msgstr ""

Expand Down
38 changes: 25 additions & 13 deletions packaging/redhat/apprise-rhel7-support.patch
Original file line number Diff line number Diff line change
@@ -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
--- apprise-0.7.4/test/test_config_http.py 2019-03-05 19:39:56.000000000 -0500
+++ apprise-0.7.4-patched/test/test_config_http.py 2019-03-12 18:58:01.796635838 -0400
@@ -44,8 +44,6 @@
diff -Naur apprise-0.8.2/test/test_attach_http.py apprise-0.8.2-patched/test/test_attach_http.py
--- apprise-0.8.2/test/test_attach_http.py 2019-11-17 08:07:36.000000000 -0500
+++ apprise-0.8.2-patched/test/test_attach_http.py 2019-11-25 19:06:33.350512555 -0500
@@ -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'),
requests.HTTPError(
0, 'requests.HTTPError() not handled'),
Expand All @@ -10,22 +22,22 @@ diff -Naur apprise-0.7.4/test/test_config_http.py apprise-0.7.4-patched/test/tes
requests.TooManyRedirects(
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
--- apprise-0.7.4/test/test_glib_plugin.py 2019-03-05 19:39:56.000000000 -0500
+++ apprise-0.7.4-patched/test/test_glib_plugin.py 2019-03-12 18:59:32.764545807 -0400
@@ -47,7 +47,7 @@
diff -Naur apprise-0.8.2/test/test_glib_plugin.py apprise-0.8.2-patched/test/test_glib_plugin.py
--- apprise-0.8.2/test/test_glib_plugin.py 2019-10-29 19:55:24.000000000 -0400
+++ apprise-0.8.2-patched/test/test_glib_plugin.py 2019-11-25 19:05:56.822498971 -0500
@@ -48,7 +48,7 @@

if 'dbus' not in sys.modules:
# Environment doesn't allow for dbus
- pytest.skip("Skipping dbus-python based tests", allow_module_level=True)
+ pytest.skip("Skipping dbus-python based tests")

from dbus import DBusException # noqa E402

@mock.patch('dbus.SessionBus')
diff -Naur apprise-0.7.4/test/test_rest_plugins.py apprise-0.7.4-patched/test/test_rest_plugins.py
--- apprise-0.7.4/test/test_rest_plugins.py 2019-03-10 14:28:40.000000000 -0400
+++ apprise-0.7.4-patched/test/test_rest_plugins.py 2019-03-12 18:58:08.538542247 -0400
@@ -51,8 +51,6 @@
diff -Naur apprise-0.8.2/test/test_rest_plugins.py apprise-0.8.2-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.8.2-patched/test/test_rest_plugins.py 2019-11-25 19:06:38.337514409 -0500
@@ -57,8 +57,6 @@
0, 'requests.RequestException() not handled'),
requests.HTTPError(
0, 'requests.HTTPError() not handled'),
Expand Down
51 changes: 27 additions & 24 deletions packaging/redhat/python-apprise.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
%if 0%{?fedora} || 0%{?rhel} >= 8
# Python v2 Support dropped
%global with_python2 0
%endif # fedora and/or rhel7
%endif

%if 0%{?_module_build}
%bcond_with tests
%else
# When bootstrapping Python, we cannot test this yet
%bcond_without tests
%endif # module_build
%endif

%if 0%{?rhel} && 0%{?rhel} <= 7
%global with_python3 0
%endif # using rhel7
%endif

%global pypi_name apprise

Expand All @@ -55,7 +55,7 @@ SendGrid, SimplePush, Slack, Super Toasty, Stride, Syslog, Techulus Push,
Telegram, Twilio, Twitter, Twist, XBMC, XMPP, Webex Teams}

Name: python-%{pypi_name}
Version: 0.8.1
Version: 0.8.2
Release: 1%{?dist}
Summary: A simple wrapper to many popular notification services used today
License: MIT
Expand Down Expand Up @@ -86,7 +86,7 @@ BuildRequires: python-yaml
%else
BuildRequires: python2-babel
BuildRequires: python2-yaml
%endif # using rhel7
%endif

Requires: python-requests
Requires: python2-requests-oauthlib
Expand All @@ -96,30 +96,30 @@ Requires: python-markdown
Requires: python-yaml
%else
Requires: python2-yaml
%endif # using rhel7
%endif

%if %{with tests}
BuildRequires: python-mock
BuildRequires: python2-pytest-runner
BuildRequires: python2-pytest

%endif # with_tests
%endif

%description -n python2-%{pypi_name} %{common_description}
%endif # with_python2
%endif

%package -n %{pypi_name}
Summary: Apprise CLI Tool

%if 0%{?with_python3}
Requires: python%{python3_pkgversion}-click >= 5.0
Requires: python%{python3_pkgversion}-%{pypi_name} = %{version}-%{release}
%endif # with_python3
%endif

%if 0%{?with_python2}
Requires: python2-click >= 5.0
Requires: python2-%{pypi_name} = %{version}-%{release}
%endif # with_python2
%endif

%description -n %{pypi_name}
An accompanied CLI tool that can be used as part of Apprise
Expand Down Expand Up @@ -149,33 +149,33 @@ Requires: python%{python3_pkgversion}-yaml
BuildRequires: python%{python3_pkgversion}-mock
BuildRequires: python%{python3_pkgversion}-pytest
BuildRequires: python%{python3_pkgversion}-pytest-runner
%endif # with_tests
%endif

%description -n python%{python3_pkgversion}-%{pypi_name} %{common_description}
%endif # with_python3
%endif

%prep
%setup -q -n %{pypi_name}-%{version}
%if 0%{?rhel} && 0%{?rhel} <= 7
# rhel7 older package work-arounds
%patch0 -p1
%endif # using rhel7
%endif

%build
%if 0%{?with_python2}
%py2_build
%endif # with_python2
%endif
%if 0%{?with_python3}
%py3_build
%endif # with_python3
%endif

%install
%if 0%{?with_python2}
%py2_install
%endif # with_python2
%endif
%if 0%{?with_python3}
%py3_install
%endif # with_python3
%endif

install -p -D -T -m 0644 packaging/man/%{pypi_name}.1 \
%{buildroot}%{_mandir}/man1/%{pypi_name}.1
Expand All @@ -184,11 +184,11 @@ install -p -D -T -m 0644 packaging/man/%{pypi_name}.1 \
%check
%if 0%{?with_python2}
LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python2_sitelib} py.test
%endif # with_python2
%endif
%if 0%{?with_python3}
LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version}
%endif # with_python3
%endif # with_tests
%endif
%endif

%if 0%{?with_python2}
%files -n python2-%{pypi_name}
Expand All @@ -197,7 +197,7 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
%{python2_sitelib}/%{pypi_name}
%exclude %{python2_sitelib}/%{pypi_name}/cli.*
%{python2_sitelib}/*.egg-info
%endif # with_python2
%endif

%if 0%{?with_python3}
%files -n python%{python3_pkgversion}-%{pypi_name}
Expand All @@ -206,21 +206,24 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
%{python3_sitelib}/%{pypi_name}
%exclude %{python3_sitelib}/%{pypi_name}/cli.*
%{python3_sitelib}/*.egg-info
%endif # with_python3
%endif

%files -n %{pypi_name}
%{_bindir}/%{pypi_name}
%{_mandir}/man1/%{pypi_name}.1*

%if 0%{?with_python3}
%{python3_sitelib}/%{pypi_name}/cli.*
%endif # with_python3
%endif

%if 0%{?with_python2}
%{python2_sitelib}/%{pypi_name}/cli.*
%endif # with_python2
%endif

%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
- Updated to v0.8.1

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

setup(
name='apprise',
version='0.8.1',
version='0.8.2',
description='Push Notifications that work with just about every platform!',
license='MIT',
long_description=open('README.md').read(),
Expand Down

0 comments on commit 49cb8be

Please sign in to comment.