updated to work with Apprise v1.8.0

caronc · May 11, 2024 · 6e57e33 · 6e57e33
1 parent 135dd4e
commit 6e57e33
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/apprise_api/api/tests/test_notify.py b/apprise_api/api/tests/test_notify.py
@@ -33,7 +33,7 @@
 from inspect import cleandoc
 
 # Grant access to our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class NotifyTests(SimpleTestCase):
@@ -1176,7 +1176,7 @@ def test_notify_by_loaded_urls_with_json(self, mock_notify):
         assert mock_notify.call_count == 1
         assert response['content-type'].startswith('text/html')
 
-    @mock.patch('apprise.plugins.NotifyEmail.NotifyEmail.send')
+    @mock.patch('apprise.plugins.email.NotifyEmail.send')
     def test_notify_with_filters(self, mock_send):
         """
         Test workings of APPRISE_DENY_SERVICES and APPRISE_ALLOW_SERVICES

diff --git a/apprise_api/api/tests/test_stateful_notify.py b/apprise_api/api/tests/test_stateful_notify.py
@@ -35,7 +35,7 @@
 import inspect
 
 # Grant access to our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class StatefulNotifyTests(SimpleTestCase):

diff --git a/apprise_api/api/tests/test_stateless_notify.py b/apprise_api/api/tests/test_stateless_notify.py
@@ -33,7 +33,7 @@
 import apprise
 
 # Grant access to our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class StatelessNotifyTests(SimpleTestCase):
@@ -350,7 +350,7 @@ def test_stateless_notify_recursion(self, mock_notify):
         }
 
         # Monkey Patch
-        apprise.plugins.NotifyEmail.NotifyEmail.enabled = True
+        apprise.plugins.email.NotifyEmail.enabled = True
 
         # At a minimum 'body' is requred
         form = NotifyByUrlForm(data=form_data)
@@ -606,7 +606,7 @@ def test_notify_by_loaded_urls_with_json(self, mock_notify):
         assert response.status_code == 400
         assert mock_notify.call_count == 0
 
-    @mock.patch('apprise.plugins.NotifyJSON.NotifyJSON.send')
+    @mock.patch('apprise.plugins.custom_json.NotifyJSON.send')
     def test_notify_with_filters(self, mock_send):
         """
         Test workings of APPRISE_DENY_SERVICES and APPRISE_ALLOW_SERVICES

diff --git a/apprise_api/api/utils.py b/apprise_api/api/utils.py
@@ -78,10 +78,10 @@ class AttachmentPayload(object):
 )
 
 # Access our Attachment Manager Singleton
-A_MGR = apprise.AttachmentManager.AttachmentManager()
+A_MGR = apprise.manager_attachment.AttachmentManager()
 
 # Access our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class Attachment(A_MGR['file']):

diff --git a/apprise_api/api/views.py b/apprise_api/api/views.py
@@ -100,7 +100,7 @@ def default(self, obj):
         if isinstance(obj, set):
             return list(obj)
 
-        elif isinstance(obj, apprise.AppriseLocale.LazyTranslation):
+        elif isinstance(obj, apprise.locale.LazyTranslation):
             return str(obj)
 
         return super().default(obj)

diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@
 # apprise @ git+https://github.com/caronc/apprise@custom-tag-or-version
 
 ## 3. The below grabs our stable version (generally the best choice):
-apprise == 1.7.6
+apprise == 1.8.0
 
 ## Apprise API Minimum Requirements
 django