From 1228b3884e66b347dbbe8b36c397790e6b501f86 Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Sat, 8 Oct 2022 14:05:28 -0400 Subject: [PATCH] bumped version to v1.1.0 --- Dockerfile.py35 => Dockerfile.py36 | 4 ++-- apprise/__init__.py | 2 +- apprise/i18n/apprise.pot | 25 +++++++++++++++++++++++-- docker-compose.yml | 20 ++++++-------------- packaging/redhat/python-apprise.spec | 7 +++++-- setup.py | 2 +- 6 files changed, 38 insertions(+), 22 deletions(-) rename Dockerfile.py35 => Dockerfile.py36 (81%) diff --git a/Dockerfile.py35 b/Dockerfile.py36 similarity index 81% rename from Dockerfile.py35 rename to Dockerfile.py36 index 9451a2b7..d934b12c 100644 --- a/Dockerfile.py35 +++ b/Dockerfile.py36 @@ -1,5 +1,5 @@ # Base -FROM python:3.5-buster +FROM python:3.6-buster RUN apt-get update && \ apt-get install -y libdbus-1-dev build-essential musl-dev bash RUN pip install dbus-python @@ -10,7 +10,7 @@ WORKDIR /apprise COPY requirements.txt / COPY dev-requirements.txt / ENV PYTHONPATH /apprise -ENV PYTHONPYCACHEPREFIX /apprise/__pycache__/py35 +ENV PYTHONPYCACHEPREFIX /apprise/__pycache__/py36 RUN pip install -r /requirements.txt -r /dev-requirements.txt diff --git a/apprise/__init__.py b/apprise/__init__.py index f7254119..04ae0982 100644 --- a/apprise/__init__.py +++ b/apprise/__init__.py @@ -24,7 +24,7 @@ # THE SOFTWARE. __title__ = 'Apprise' -__version__ = '1.0.0' +__version__ = '1.1.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 859bc0f2..92ca8ecd 100644 --- a/apprise/i18n/apprise.pot +++ b/apprise/i18n/apprise.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apprise 1.0.0\n" +"Project-Id-Version: apprise 1.1.0\n" "Report-Msgid-Bugs-To: lead2gold@gmail.com\n" -"POT-Creation-Date: 2022-08-06 13:14-0400\n" +"POT-Creation-Date: 2022-10-08 14:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -242,6 +242,9 @@ msgstr "" msgid "Flair Text" msgstr "" +msgid "Flash" +msgstr "" + msgid "Footer Logo" msgstr "" @@ -430,6 +433,9 @@ msgstr "" msgid "Remove Tokens" msgstr "" +msgid "Reply To" +msgstr "" + msgid "Reply To Email" msgstr "" @@ -445,6 +451,9 @@ msgstr "" msgid "Route" msgstr "" +msgid "Route Group" +msgstr "" + msgid "Routing Key" msgstr "" @@ -529,6 +538,9 @@ msgstr "" msgid "Target Chat ID" msgstr "" +msgid "Target Contact" +msgstr "" + msgid "Target Device" msgstr "" @@ -547,6 +559,9 @@ msgstr "" msgid "Target Escalation" msgstr "" +msgid "Target Group" +msgstr "" + msgid "Target Group ID" msgstr "" @@ -613,6 +628,9 @@ msgstr "" msgid "Tenant Domain" msgstr "" +msgid "Test Only" +msgstr "" + msgid "Text To Speech" msgstr "" @@ -652,6 +670,9 @@ msgstr "" msgid "URL Title" msgstr "" +msgid "Unicode Characters" +msgstr "" + msgid "Urgency" msgstr "" diff --git a/docker-compose.yml b/docker-compose.yml index c0c29bd5..f691bc3a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,9 @@ version: "3.3" services: - test.py27: - build: - context: . - dockerfile: Dockerfile.py27 - volumes: - - ./:/apprise - test.py35: build: context: . - dockerfile: Dockerfile.py35 + dockerfile: Dockerfile.py36 volumes: - ./:/apprise @@ -22,21 +15,20 @@ services: - ./:/apprise # Connect to web and create a new project using the manage script -# -> docker-compose run --rm test.py27 bash +# -> docker-compose run --rm test.py36 bash # bin/apprise - # bin/checkdone.sh # # Run a set of tests for just a certain section -# docker-compose run --rm test.py27 bin/test.sh fcm +# docker-compose run --rm test.py36 bin/test.sh fcm # -# Or just run all the tsts in python 2.7 -# docker-compose run --rm test.py27 bin/test.sh +# Or just run all the tests in python 3.6 +# docker-compose run --rm test.py36 bin/test.sh # # Want to run the whole test suite: # # [ -f .coverage ] && rm -f .coverage -# docker-compose run --rm test.py27 coverage run --append -m pytest -vv -# docker-compose run --rm test.py35 coverage run --append -m pytest -vv +# docker-compose run --rm test.py36 coverage run --append -m pytest -vv # docker-compose run --rm test.py310 coverage run --append -m pytest -vv # # # Now produce a report diff --git a/packaging/redhat/python-apprise.spec b/packaging/redhat/python-apprise.spec index 60e1d1be..1b3e511c 100644 --- a/packaging/redhat/python-apprise.spec +++ b/packaging/redhat/python-apprise.spec @@ -48,8 +48,8 @@ Streamlabs, Stride, Syslog, Techulus Push, Telegram, Twilio, Twitter, Twist, XBMC, Vonage, Webex Teams} Name: python-%{pypi_name} -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A simple wrapper to many popular notification services used today License: MIT URL: https://github.com/caronc/%{pypi_name} @@ -147,6 +147,9 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version %{python3_sitelib}/%{pypi_name}/cli.* %changelog +* Sat Oct 8 2022 Chris Caron - 1.1.0-1 +- Updated to v1.1.0 + * Fri Oct 7 2022 Chris Caron - 1.0.0-3 - Python 2 Support dropped diff --git a/setup.py b/setup.py index b7183fc5..e8666c12 100755 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ else: setup( name='apprise', - version='1.0.0', + version='1.1.0', description='Push Notifications that work with just about every platform!', license='MIT', long_description=open('README.md').read(),