webchanges 3.33.0__tar.gz → 3.34.0__tar.gz

{webchanges-3.33.0/webchanges.egg-info → webchanges-3.34.0}/PKG-INFO

@@ -1,75 +1,10 @@
 Metadata-Version: 2.4
 Name: webchanges
-Version: 3.33.0
+Version: 3.34.0
 Summary: Web Changes Delivered. AI-Summarized. Totally Anonymous.
 Author-email: Mike Borsetti <mike+webchanges@borsetti.com>
 Maintainer-email: Mike Borsetti <mike+webchanges@borsetti.com>
-License: ========
-        Licenses
-        ========
-        
-        The MIT License (MIT)
-        
-        Copyright (c) 2020- Mike Borsetti <mike@borsetti.com>
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy of
-        this software and associated documentation files (the "Software"), to deal in
-        the Software without restriction, including without limitation the rights to
-        use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-        the Software, and to permit persons to whom the Software is furnished to do so,
-        subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-        FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-        COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-        IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-        CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-        
-        --------------------------------------------------------------------------------
-        
-        SOURCE CODE REDISTRIBUTION NOTICE
-        (urlwatch by Thomas Perl)
-        
-        This software redistributes source code of release 2.21, dated 30 July 2020, of
-        urlwatch
-        https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f,
-        which is subject to the following copyright notice and license (from
-        https://raw.githubusercontent.com/thp/urlwatch/346b25914b0418342ffe2fb0529bed702fddc01f/COPYING),
-        hereby retained and redistributed with the source code (of which this license
-        file is part of), in binary form, and in the documentation. The appearance of
-        the name of the author below does not constitute an endorsement or promotion of
-        this software by such author.
-        
-        Copyright (c) 2008-2020 Thomas Perl <m@thp.io>
-        All rights reserved.
-        
-        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. The name of the author may not be used to endorse or promote products
-           derived from this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR 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.
-        
+License-Expression: MIT AND BSD-3-Clause
 Project-URL: Documentation, https://webchanges.readthedocs.io/
 Project-URL: Repository, https://github.com/mborsetti/webchanges/
 Project-URL: Changelog, https://webchanges.readthedocs.io/en/stable/changelog.html
@@ -81,8 +16,6 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -219,6 +152,11 @@ Running in Docker
 implementation (no browser) `here <https://github.com/yubiuser/webchanges-docker>`__, and one with a browser
 `here <https://github.com/jhedlund/webchanges-docker>`__.
 
+As a GitHub Action
+------------------
+**webchanges** can easily run as a `GitHub Action <https://www.docker.com/>`__! You will find an implementation 
+`here <https://github.com/swimmwatch/webchanges-action>`__.
+
 
 Documentation |readthedocs|
 ===========================

{webchanges-3.33.0 → webchanges-3.34.0}/README.rst

@@ -51,6 +51,11 @@ Running in Docker
 implementation (no browser) `here <https://github.com/yubiuser/webchanges-docker>`__, and one with a browser
 `here <https://github.com/jhedlund/webchanges-docker>`__.
 
+As a GitHub Action
+------------------
+**webchanges** can easily run as a `GitHub Action <https://www.docker.com/>`__! You will find an implementation 
+`here <https://github.com/swimmwatch/webchanges-action>`__.
+
 
 Documentation |readthedocs|
 ===========================

{webchanges-3.33.0 → webchanges-3.34.0}/pyproject.toml

@@ -17,7 +17,8 @@ name = 'webchanges'
 description = 'Web Changes Delivered. AI-Summarized. Totally Anonymous.'
 readme = { file = 'README.rst', content-type = 'text/x-rst' }
 requires-python = '>=3.11'
-license = { file = 'LICENSE.md' }
+license = "MIT AND BSD-3-Clause"
+license-files = ['LICENSE.md']
 authors = [{ name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com' }]
 maintainers = [
     { name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com' },
@@ -29,8 +30,6 @@ classifiers = [
     'Intended Audience :: Developers',
     'Intended Audience :: End Users/Desktop',
     'Intended Audience :: System Administrators',
-    'License :: OSI Approved :: BSD License',
-    'License :: OSI Approved :: MIT License',
     'Natural Language :: English',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
@@ -291,6 +290,9 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = '^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$'
 
+# List of allowed 'confusable' Unicode characters to ignore when enforcing RUF001, RUF002, and RUF003.
+allowed-confusables = ['–', '‘', '’']
+
 [tool.ruff.lint.flake8-annotations]
 allow-star-arg-any = true # TODO
 
@@ -346,6 +348,7 @@ docstring-code-format = true
 # enabled.
 docstring-code-line-length = 'dynamic'
 
+
 # -------------------------- ty --------------------------
 # Config file documentation at https://docs.astral.sh/ty/reference/configuration/
 

{webchanges-3.33.0 → webchanges-3.34.0}/webchanges/__init__.py

@@ -22,7 +22,7 @@ __project_name__ = str(__package__)
 # * MINOR version when you add functionality in a backwards compatible manner, and
 # * MICRO or PATCH version when you make backwards compatible bug fixes. We no longer use '0'
 # If unsure on increments, use pkg_resources.parse_version to parse
-__version__ = '3.33.0'
+__version__ = '3.34.0'
 __description__ = (
     'Check web (or command output) for changes since last run and notify.\n\nAnonymously alerts you of web changes.'
 )

{webchanges-3.33.0 → webchanges-3.34.0}/webchanges/command.py

@@ -64,9 +64,10 @@ class UrlwatchCommand:
         self.urlwatcher = urlwatcher
         self.urlwatch_config = urlwatcher.urlwatch_config
 
-    @staticmethod
-    def _exit(arg: str | int | None) -> None:
+    def _exit(self, arg: str | int | None) -> None:
         logger.info(f'Exiting with exit code {arg}')
+
+        self.urlwatcher.ssdb_storage.close()
         sys.exit(arg)
 
     def jobs_from_joblist(self) -> Iterator[JobBase]:
@@ -511,7 +512,6 @@ class UrlwatchCommand:
             return
         self.urlwatcher.urlwatch_config.joblist = set(self.urlwatcher.urlwatch_config.joblist).union(new_jobs)
         self.urlwatcher.run_jobs()
-        self.urlwatcher.close()
         return
 
     def test_differ(self, arg_test_differ: list[str]) -> int:
@@ -866,7 +866,6 @@ class UrlwatchCommand:
         count = self.urlwatcher.ssdb_storage.rollback(dt.timestamp())
         if count:
             print(f'Deleted {count} snapshots taken after {timestamp_date}.')
-            self.urlwatcher.ssdb_storage.close()
         else:
             print(f'No snapshots found after {timestamp_date}')
         return 0
@@ -984,15 +983,14 @@ class UrlwatchCommand:
             print('You need to set up your bot token first (see documentation).')
             self._exit(1)
 
-        get_client = httpx.Client(http2=h2 is not None).get if httpx else requests.get
-
-        info = get_client(f'https://api.telegram.org/bot{bot_token}/getMe', timeout=60).json()
-        if not info['ok']:
-            print(f'Error with token {bot_token}: {info["description"]}.')
-            self._exit(1)
+        with httpx.Client(http2=h2 is not None) if httpx else requests.Session() as http_client:
+            info = http_client.get(f'https://api.telegram.org/bot{bot_token}/getMe', timeout=60).json()
+            if not info['ok']:
+                print(f'Error with token {bot_token}: {info["description"]}.')
+                self._exit(1)
 
-        chats = {}
-        updates = get_client(f'https://api.telegram.org/bot{bot_token}/getUpdates', timeout=60).json()
+            chats = {}
+            updates = http_client.get(f'https://api.telegram.org/bot{bot_token}/getUpdates', timeout=60).json()
         if 'result' in updates:
             for chat_info in updates['result']:
                 chat = chat_info['message']['chat']
@@ -1301,19 +1299,16 @@ class UrlwatchCommand:
             self.urlwatcher.ssdb_storage.gc(
                 [job.guid for job in self.urlwatcher.jobs], self.urlwatch_config.gc_database
             )
-            self.urlwatcher.ssdb_storage.close()
             self._exit(0)
 
         if self.urlwatch_config.clean_database:
             self.urlwatcher.ssdb_storage.clean_ssdb(
                 [job.guid for job in self.urlwatcher.jobs], self.urlwatch_config.clean_database
             )
-            self.urlwatcher.ssdb_storage.close()
             self._exit(0)
 
         if self.urlwatch_config.rollback_database:
             exit_arg = self.rollback_database(self.urlwatch_config.rollback_database)
-            self.urlwatcher.ssdb_storage.close()
             self._exit(exit_arg)
 
         if self.urlwatch_config.delete_snapshot: