Browse Source

bumped version to v1.4.5

pull/901/head v1.4.5
Chris Caron 1 year ago
parent
commit
78f5693382
  1. 6
      Dockerfile.py310
  2. 52
      Dockerfile.py311
  3. 2
      apprise/__init__.py
  4. 42
      apprise/i18n/apprise.pot
  5. 5
      apprise/plugins/NotifySparkPost.py
  6. 8
      packaging/redhat/python-apprise.spec
  7. 2
      setup.cfg
  8. 2
      setup.py

6
Dockerfile.py310

@ -44,5 +44,9 @@ COPY dev-requirements.txt /
ENV PYTHONPATH /apprise
ENV PYTHONPYCACHEPREFIX /apprise/__pycache__/py310
RUN pip install -r /requirements.txt -r /dev-requirements.txt
RUN addgroup --gid ${USER_GID:-1000} apprise
RUN adduser --system --uid ${USER_UID:-1000} --ingroup apprise --home /apprise --no-create-home --disabled-password apprise
USER apprise

52
Dockerfile.py311

@ -0,0 +1,52 @@
# -*- coding: utf-8 -*-
# BSD 3-Clause License
#
# Apprise - Push Notification Library.
# Copyright (c) 2023, Chris Caron <lead2gold@gmail.com>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# Base
FROM python:3.11-buster
RUN apt-get update && \
apt-get install -y libdbus-1-dev libgirepository1.0-dev build-essential musl-dev bash
RUN pip install dbus-python PyGObject
# Apprise Setup
VOLUME ["/apprise"]
WORKDIR /apprise
COPY requirements.txt /
COPY dev-requirements.txt /
ENV PYTHONPATH /apprise
ENV PYTHONPYCACHEPREFIX /apprise/__pycache__/py311
RUN pip install -r /requirements.txt -r /dev-requirements.txt
RUN addgroup --gid ${USER_GID:-1000} apprise
RUN adduser --system --uid ${USER_UID:-1000} --ingroup apprise --home /apprise --no-create-home --disabled-password apprise
USER apprise

2
apprise/__init__.py

@ -31,7 +31,7 @@
# POSSIBILITY OF SUCH DAMAGE.
__title__ = 'Apprise'
__version__ = '1.4.0'
__version__ = '1.4.5'
__author__ = 'Chris Caron'
__license__ = 'BSD'
__copywrite__ = 'Copyright (C) 2023 Chris Caron <lead2gold@gmail.com>'

42
apprise/i18n/apprise.pot

@ -6,16 +6,16 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: apprise 1.4.0\n"
"Project-Id-Version: apprise 1.4.5\n"
"Report-Msgid-Bugs-To: lead2gold@gmail.com\n"
"POT-Creation-Date: 2023-05-15 16:33-0400\n"
"POT-Creation-Date: 2023-07-06 20:30-0400\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.9.1\n"
"Generated-By: Babel 2.11.0\n"
msgid "A local Gnome environment is required."
msgstr ""
@ -164,6 +164,9 @@ msgstr ""
msgid "Consumer Secret"
msgstr ""
msgid "Content Placement"
msgstr ""
msgid "Country"
msgstr ""
@ -224,12 +227,6 @@ msgstr ""
msgid "Email Header"
msgstr ""
msgid "Encrypted Password"
msgstr ""
msgid "Encrypted Salt"
msgstr ""
msgid "Entity"
msgstr ""
@ -272,6 +269,9 @@ msgstr ""
msgid "From Name"
msgstr ""
msgid "From Phone ID"
msgstr ""
msgid "From Phone No"
msgstr ""
@ -317,6 +317,9 @@ msgstr ""
msgid "Integration ID"
msgstr ""
msgid "Integration Key"
msgstr ""
msgid "Is Ad?"
msgstr ""
@ -478,7 +481,7 @@ msgstr ""
msgid "Retry"
msgstr ""
msgid "Rooms"
msgid "Room ID"
msgstr ""
msgid "Route"
@ -487,15 +490,18 @@ msgstr ""
msgid "Route Group"
msgstr ""
msgid "Routing Key"
msgid "SMTP Server"
msgstr ""
msgid "SMTP Server"
msgid "Salt"
msgstr ""
msgid "Schema"
msgstr ""
msgid "Secret"
msgstr ""
msgid "Secret Access Key"
msgstr ""
@ -616,6 +622,9 @@ msgstr ""
msgid "Target Queue"
msgstr ""
msgid "Target Room"
msgstr ""
msgid "Target Room Alias"
msgstr ""
@ -661,6 +670,12 @@ msgstr ""
msgid "Template Data"
msgstr ""
msgid "Template Mapping"
msgstr ""
msgid "Template Name"
msgstr ""
msgid "Template Path"
msgstr ""
@ -802,3 +817,6 @@ msgstr ""
msgid "ttl"
msgstr ""
msgid "validity"
msgstr ""

5
apprise/plugins/NotifySparkPost.py

@ -225,7 +225,7 @@ class NotifySparkPost(NotifyBase):
}
def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
region_name=None, headers=None, tokens=None, batch=False,
region_name=None, headers=None, tokens=None, batch=None,
**kwargs):
"""
Initialize SparkPost Object
@ -296,7 +296,8 @@ class NotifySparkPost(NotifyBase):
self.tokens.update(tokens)
# Prepare Batch Mode Flag
self.batch = batch
self.batch = self.template_args['batch']['default'] \
if batch is None else batch
if targets:
# Validate recipients (to:) and drop bad ones:

8
packaging/redhat/python-apprise.spec

@ -56,7 +56,7 @@ SparkPost, Super Toasty, Streamlabs, Stride, Syslog, Techulus Push, Telegram,
Twilio, Twitter, Twist, XBMC, Voipms, Vonage, WhatsApp, Webex Teams}
Name: python-%{pypi_name}
Version: 1.4.0
Version: 1.4.5
Release: 1%{?dist}
Summary: A simple wrapper to many popular notification services used today
License: BSD
@ -186,6 +186,12 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
%{python3_sitelib}/%{pypi_name}/cli.*
%changelog
* Thu Jul 6 2023 Chris Caron <lead2gold@gmail.com> - 1.4.5
- Updated to v1.4.5
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 1.4.0-2
- Rebuilt for Python 3.12
* Mon May 15 2023 Chris Caron <lead2gold@gmail.com> - 1.4.0
- Updated to v1.4.0

2
setup.cfg

@ -1,5 +1,5 @@
[bdist_wheel]
universal = 1
universal = 0
[metadata]
# ensure LICENSE is included in wheel metadata

2
setup.py

@ -66,7 +66,7 @@ else:
setup(
name='apprise',
version='1.4.0',
version='1.4.5',
description='Push Notifications that work with just about every platform!',
license='BSD',
long_description=open('README.md', encoding="utf-8").read(),

Loading…
Cancel
Save