webchanges 3.31.3__tar.gz → 3.31.4__tar.gz

{webchanges-3.31.3/webchanges.egg-info → webchanges-3.31.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webchanges
-Version: 3.31.3
+Version: 3.31.4
 Summary: Web Changes Delivered. AI-Summarized. Totally Anonymous.
 Author-email: Mike Borsetti <mike+webchanges@borsetti.com>
 Maintainer-email: Mike Borsetti <mike+webchanges@borsetti.com>
@@ -92,6 +92,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
@@ -101,7 +102,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
-License-File: LICENSE
+License-File: LICENSE.md
 Requires-Dist: colorama; sys_platform == "win32"
 Requires-Dist: cssselect
 Requires-Dist: h2
@@ -113,7 +114,7 @@ Requires-Dist: msgpack
 Requires-Dist: platformdirs
 Requires-Dist: pyyaml
 Requires-Dist: tzdata; sys_platform == "win32"
-Requires-Dist: zstandard
+Requires-Dist: zstandard; python_version < "3.14"
 Provides-Extra: use-browser
 Requires-Dist: playwright; extra == "use-browser"
 Requires-Dist: psutil; extra == "use-browser"
@@ -266,7 +267,7 @@ Schedule
 
 Code
 ====
-|coveralls| |snyk| |issues| |code_style|
+|coveralls| |snyk| |issues| |code_style| |OpenSSF_Scorecard|
 
 The code, issues tracker, and discussions are hosted on `GitHub <https://github.com/mborsetti/webchanges>`__.
 
@@ -285,7 +286,7 @@ License
 =======
 |license|
 
-See the `complete licenses <https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE>`__ (released
+See the `complete licenses <https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE.md>`__ (released
 under the `MIT License <https://opensource.org/licenses/MIT>`__ but redistributing modified source code, dated 30
 July 2020, from `urlwatch 2.21 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__
 licensed under a `BSD 3-Clause License
@@ -346,3 +347,6 @@ configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upg
 .. |snyk| image:: https://snyk.io/advisor/python/holidays/badge.svg
     :target: https://snyk.io/advisor/python/holidays
     :alt: Snyk Package Health Score
+.. |OpenSSF_Scorecard| image:: https://api.scorecard.dev/projects/github.com/mborsetti/webchanges/badge
+    :target: https://scorecard.dev/viewer/?uri=github.com/mborsetti/webchanges
+    :alt: OpenSSF Scoreard

{webchanges-3.31.3 → webchanges-3.31.4}/README.rst

@@ -100,7 +100,7 @@ Schedule
 
 Code
 ====
-|coveralls| |snyk| |issues| |code_style|
+|coveralls| |snyk| |issues| |code_style| |OpenSSF_Scorecard|
 
 The code, issues tracker, and discussions are hosted on `GitHub <https://github.com/mborsetti/webchanges>`__.
 
@@ -119,7 +119,7 @@ License
 =======
 |license|
 
-See the `complete licenses <https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE>`__ (released
+See the `complete licenses <https://raw.githubusercontent.com/mborsetti/webchanges/refs/heads/main/LICENSE.md>`__ (released
 under the `MIT License <https://opensource.org/licenses/MIT>`__ but redistributing modified source code, dated 30
 July 2020, from `urlwatch 2.21 <https://github.com/thp/urlwatch/tree/346b25914b0418342ffe2fb0529bed702fddc01f>`__
 licensed under a `BSD 3-Clause License
@@ -180,3 +180,6 @@ configuration files), see `here <https://webchanges.readthedocs.io/en/stable/upg
 .. |snyk| image:: https://snyk.io/advisor/python/holidays/badge.svg
     :target: https://snyk.io/advisor/python/holidays
     :alt: Snyk Package Health Score
+.. |OpenSSF_Scorecard| image:: https://api.scorecard.dev/projects/github.com/mborsetti/webchanges/badge
+    :target: https://scorecard.dev/viewer/?uri=github.com/mborsetti/webchanges
+    :alt: OpenSSF Scoreard

{webchanges-3.31.3 → webchanges-3.31.4}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [build-system]
 # Minimum requirements for the build system to execute.
-requires = ['setuptools']  # PEP 508 specifications.
+requires = ['setuptools'] # PEP 508 specifications.
 # Setuptools specification
 build-backend = "setuptools.build_meta"
 
@@ -17,12 +17,10 @@ name = 'webchanges'
 description = 'Web Changes Delivered. AI-Summarized. Totally Anonymous.'
 readme = { file = 'README.rst', content-type = 'text/x-rst' }
 requires-python = '>=3.10'
-license = {file = 'LICENSE'}
-authors = [
-    {name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com'},
-]
+license = { file = 'LICENSE.md' }
+authors = [{ name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com' }]
 maintainers = [
-    {name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com'},
+    { name = 'Mike Borsetti', email = 'mike+webchanges@borsetti.com' },
 ]
 keywords = ['webmonitoring', 'monitoring']
 classifiers = [
@@ -42,6 +40,7 @@ classifiers = [
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
     'Programming Language :: Python :: Implementation :: CPython',
     'Topic :: Internet',
     'Topic :: Internet :: WWW/HTTP',
@@ -90,56 +89,27 @@ redis = ['redis']
 requests = ['requests']
 safe_password = ['keyring']
 all = [
-    'webchanges[use_browser,beautify,bs4,html5lib,ical2text,jq,ocr,pdf2text,pypdf_crypto,deepdiff_xml,imagediff,matrix,pushbullet,pushover,xmpp,redis,requests,safe_password]'
+    'webchanges[use_browser,beautify,bs4,html5lib,ical2text,jq,ocr,pdf2text,pypdf_crypto,deepdiff_xml,imagediff,matrix,pushbullet,pushover,xmpp,redis,requests,safe_password]',
 ]
 
 
 # -------------------------- setuptools --------------------------
+[tool.setuptools]
 # Called by build
 # See https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
-[tool.setuptools]
-# explicit package listing is required for building in tox -e new-install
+
+# Explicit package listing is required for building in tox -e new-install
 # https://setuptools.pypa.io/en/latest/userguide/package_discovery.html
 packages = ['webchanges', 'webchanges._vendored']
 
 [tool.setuptools.dynamic]
-version = {attr = 'webchanges.__version__'}
-dependencies = {file = 'requirements.txt'}
+version = { attr = 'webchanges.__version__' }
+dependencies = { file = 'requirements.txt' }
 
 [tool.setuptools.package-data]
 'webchanges' = ['py.typed']
 
 
-# -------------------------- bandit --------------------------
-[tool.bandit]
-# Find common security issues in Python code.
-# Runs as part of pre-commit.
-# Config file documentation at https://bandit.readthedocs.io/en/latest/config.html
-
-targets = ['webchanges', 'tests']
-skips = [
-    'B101',  # Use of assert detected.
-    'B404',  # Consider possible security implications associated with subprocess module.
-    'B602',  # subprocess call with shell=True identified, security issue.
-    'B603'   # subprocess call - check for execution of untrusted input.
-]
-
-
-# -------------------------- black --------------------------
-[tool.black]
-# Uncompromising code formatting
-# Runs as part of pre-commit
-# Config file documentation
-# https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#configuration-via-a-file
-
-# What's in here overrides the command-line options shown by running $ black --help.
-line-length = 120
-target-version = ['py310']
-skip-string-normalization = true
-extend-exclude = '/(\.idea|\.pytest_cache|\__pycache__|\venv.*|\webchanges.egg-info)/'
-color = true
-
-
 # -------------------------- coverage --------------------------
 [tool.coverage.run]
 # Runs in Github Actions (see .github/workflows/ci-cd.yaml) and in tox (see tox.ini).
@@ -193,50 +163,13 @@ exclude_lines = [
     'except ImportError:',
 
     # Don't cover IDE code:
-    'if TYPE_CHECKING:'
+    'if TYPE_CHECKING:',
 ]
 # Exclude entire files if they have a custom # pragma: exclude file remark
 # exclude_also = '(?s)\A.*# pragma: exclude file.*\Z'
 # ignore_errors = true
 
 
-# -------------------------- isort --------------------------
-[tool.isort]
-# isort your imports, so you don't have to.
-# Runs as part of pre-commit.
-# Config file documentation https://pycqa.github.io/isort/docs/configuration/options.html
-
-profile = 'black'
-# multi_line_output = 3
-# use_parentheses = True
-# include_trailing_comma = True
-# force_grid_wrap = 0
-# ensure_newline_before_comments = True
-line_length = 120
-
-# Treat project as a git repository and ignore files listed in .gitignore.
-skip_gitignore = true
-
-# Force isort to recognize a module as being part of the current python project.
-known_first_party = 'webchanges'
-
-# Force isort to recognize a module as being a local folder.
-# Generally, this is reserved for relative imports (from . import module).
-known_local_folder = 'webchanges'
-
-# Force all imports to be sorted alphabetically within a section.
-force_alphabetical_sort_within_sections = true
-
-# Automatically create section groups by the top-level package they come from.
-group_by_package = true
-
-# Remove redundant aliases from imports, such as import os as os.
-remove_redundant_aliases = true
-
-# Use color in terminal output.
-color_output = true
-
-
 # -------------------------- mypy --------------------------
 [tool.mypy]
 # Static Typing for Python
@@ -244,7 +177,7 @@ color_output = true
 # Config file documentation at https://mypy.readthedocs.io/en/stable/config_file.html
 
 # Disables import discovery of namespace packages (see PEP 420)
-namespace_packages = false
+namespace_packages = true
 
 # Specifies the Python version used to parse and check the target program.
 # python_version = 3.12
@@ -253,7 +186,7 @@ namespace_packages = false
 ignore_missing_imports = true
 
 # Disallows calling functions without type annotations from functions with type annotations.
-disallow_untyped_calls = true
+disallow_untyped_calls = false
 
 # Disallows defining functions without type annotations or with incomplete type annotations.
 disallow_untyped_defs = true
@@ -310,13 +243,9 @@ report_level = 'WARNING'
 log_auto_indent = true
 # Enable log display during test run (aka "live logging" https://docs.pytest.org/en/stable/logging.html#live-logs)
 log_cli = true
-minversion = '8.3.3'
+minversion = '8.4.1'
 testpaths = ['tests']
 
-# the below is for pytest-asyncio (used to be required due to Playwright)
-# asyncio_mode = 'auto'
-# asyncio_default_fixture_loop_scope = 'function'
-
 # Adds pytest-cov functionality (see https://pytest-cov.readthedocs.io/en/latest/config.html)
 # Note: --cov moved to .github/workflows/ci-cd.yaml and tox.ini due to interference with PyCharm breakpoints (see
 # https://github.com/pytest-dev/pytest-cov/issues/131) and to enable running tox --parallel
@@ -326,37 +255,10 @@ testpaths = ['tests']
 
 # -------------------------- ruff --------------------------
 [tool.ruff]
-# Config file documentation at https://docs.astral.sh/ruff/configuration/
-
-# Exclude a variety of commonly ignored directories.
-exclude = [
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".ipynb_checkpoints",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pyenv",
-    ".pytest_cache",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    ".vscode",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "site-packages",
-    "venv",
+# Config file documentation at https://docs.astral.sh/ruff/configuration/ and https://docs.astral.sh/ruff/settings/
 
+# File patterns to omit from formatting and linting, in addition to those specified by exclude.
+extend-exclude = [
     "webchanges/storage_minidb.py",
     "webchanges/_vendored",
 ]
@@ -367,7 +269,6 @@ exclude = [
 
 # Set the maximum line length.
 line-length = 120
-indent-width = 4
 
 # Target Python version
 # target-version = "py311"  # Commented out to infer from [project] requires-python
@@ -376,27 +277,55 @@ indent-width = 4
 # By default, Ruff enables Flake8's F rules, along with a subset of the E rules
 # Enable rules not enabled by default, and ignore specific rules.
 select = [
-    # flake8-builtins
-    "B",
-    # flake8-bandit
-    "S",
-    # flake8-datetimez
-    "DTZ",
-    # isort
-    "I",
-    # McCabe complexity 
-    # "C901",
-    # pepe8-naming
-    "N",
-    # Pyflakes
-    "F",
-    # pycodestyle errors and warnings
-    "E", "W",
-    # Ruff-specific rules
-    "RUF",
+    "ANN",  # flake8-annotations
+    "S",    # flake8-bandit
+    "BLE",  # flake8-blind-except
+    "B",    # flake8-bugbear
+    "A",    # flake8-builtin
+    "C4",   # flake8-comprehensions
+    "DTZ",  # flake8-datetimez
+    # "EM",   # flake8-errmsg  # TODO
+    "FA",   # flake8-future-annotations
+    "INT",  # flake8-gettext
+    "ISC",  # flake8-implicit-str-concat
+    "LOG",  # flake8-logging
+    # "G",    # flake8-logging-format  # TODO
+    "PIE",  # flake8-pie
+    "PYI",  # flake8-pyi
+    "PT",   # flake8-pytest-style
+    "Q",    # flake8-quotes
+    "RSE",  # flake8-raise
+    "RET",  # flake8-return
+    "SIM",  # flake8-simplify
+    "TID",  # flake8-tidy-imports
+    "TD",   # flake8-todos
+    "TC",   # flake8-type-checking
+    # "ARG",  # flake8-unused-arguments  # TODO
+    "PTH",  # flake8-use-pathlib
+    # "FLY",  # flynt   # TODO
+    "I",    # isort
+    "C90",  # mccabe 
+    "N",    # pep8-naming
+    "PERF", # Perflint
+    "E",    # pycodestyle errors
+    "W",    # pycodestyle warnings
+    # "DOC",  # pydoclint  # TODO
+    # "D",    # pydocstyle  # TODO
+    "F",    # Pyflakes
+    # "PL",   # Pylint  # TODO
+    "FURB", # refurb 
+    "RUF",  # Ruff-specific rules
+    # "TRY",  # tryceratops  # TODO
 ]
+
 ignore = [
+    "PT011",  # pytest.raises({exception}) is too broad, set the match parameter or use a more specific exception
+    "PT030",  # pytest.warns({warning}) is too broad, set the match parameter or use a more specific warning
     "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
+    "SIM105", # Use contextlib.suppress({exception}) instead of try-except-pass
+    "SIM115", # Use a context manager for opening files
+    "TD002",  #	Missing author in TODO
+    "TD003",  # Missing issue link for this TODO
 ]
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
@@ -406,6 +335,28 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
+[tool.ruff.lint.flake8-annotations]
+allow-star-arg-any = true  # TODO
+
+[tool.ruff.lint.flake8-quotes]
+inline-quotes = "single"
+
+[tool.ruff.lint.mccabe]
+# Flag errors (`C901`) whenever the complexity level exceeds below.
+max-complexity = 30
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    "S101",  # Use of `assert` detected
+]
+
+[tool.ruff.lint.pydoclint]
+# Skip docstrings which fit on a single line.
+ignore-one-line-docstrings = true
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
 [tool.ruff.format]
 # Enable the formatter, which is a drop-in replacement for Black.
 # No extra configuration is needed for basic formatting.
@@ -438,9 +389,3 @@ docstring-code-format = true
 # This only has an effect when the `docstring-code-format` setting is
 # enabled.
 docstring-code-line-length = "dynamic"
-
-[tool.ruff.lint.per-file-ignores]
-"tests/*" = [
-    # Use of `assert` detected
-    "S101"
-]

{webchanges-3.31.3 → webchanges-3.31.4}/requirements.txt

@@ -9,4 +9,4 @@ msgpack
 platformdirs
 pyyaml
 tzdata; sys_platform == 'win32'
-zstandard
+zstandard; python_version < '3.14'

{webchanges-3.31.3 → webchanges-3.31.4}/webchanges/__init__.py

@@ -3,7 +3,7 @@ it summarizes (including with Gen AI) what changed ('diff') and displays it and/
 supported services. Can check the output of local commands as well.
 """
 
-# The code below is subject to the license contained in the LICENSE file, which is part of the source code.
+# The code below is subject to the license contained in the LICENSE.md file, which is part of the source code.
 
 # The docstring above (__doc__) and the variables below are used in the program and for builds, including in building
 # documentation with Sphinx.
@@ -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.31.3'
+__version__ = '3.31.4'
 __description__ = (
     'Check web (or command output) for changes since last run and notify.\n\nAnonymously alerts you of web changes.'
 )
@@ -40,7 +40,7 @@ def init_data() -> dict[str, str | tuple]:
 
     :returns: dict of globals()
     """
-    return {k: v for k, v in globals().items()}
+    return dict(globals().items())
 
 
 if __name__ == '__main__':

{webchanges-3.31.3 → webchanges-3.31.4}/webchanges/cli.py

@@ -4,7 +4,7 @@
 
 # See config module for the command line arguments.
 
-# The code below is subject to the license contained in the LICENSE file, which is part of the source code.
+# The code below is subject to the license contained in the LICENSE.md file, which is part of the source code.
 
 from __future__ import annotations
 
@@ -33,7 +33,8 @@ logger = logging.getLogger(__name__)
 
 def python_version_warning() -> None:
     """Check if we're running on the minimum Python version supported and if so print and issue a pending deprecation
-    warning."""
+    warning.
+    """
     if sys.version_info[0:2] == __min_python_version__:
         current_minor_version = '.'.join(str(n) for n in sys.version_info[0:2])
         next_minor_version = f'{__min_python_version__[0]}.{__min_python_version__[1] + 1}'
@@ -126,10 +127,9 @@ def teardown_logger(verbose: int | None = None) -> None:
 
     :param verbose: the verbosity level (1 = INFO, 2 = ERROR).
     """
-    if verbose is not None:
-        if verbose >= 2:
-            # https://playwright.dev/python/docs/debug#verbose-api-logs
-            os.environ.pop('DEBUG', None)
+    if verbose is not None and verbose >= 2:
+        # https://playwright.dev/python/docs/debug#verbose-api-logs
+        os.environ.pop('DEBUG', None)
 
 
 def _expand_glob_files(
@@ -167,7 +167,7 @@ def _expand_glob_files(
             return file_list
 
         # no directory specified (and not in current one): add default one
-        if not file.is_absolute() and not Path(file).parent == Path.cwd():
+        if not file.is_absolute() and Path(file).parent != Path.cwd():
             file_list = list(default_path.glob(str(file)))
             if any(f.is_file() for f in file_list):
                 return file_list
@@ -222,7 +222,7 @@ def locate_storage_file(
             return file
 
         # no directory specified (and not in current one): add default one
-        if file.parent == PurePath('.'):
+        if file.parent == PurePath():
             new_file = default_path.joinpath(file)
             if new_file.is_file():
                 return new_file
@@ -307,7 +307,8 @@ def load_hooks(hooks_file: Path, is_default: bool = False) -> None:
 
 def handle_unitialized_actions(urlwatch_config: CommandConfig) -> None:
     """Handles CLI actions that do not require all classes etc. to be initialized (and command.py loaded). For speed
-    purposes."""
+    purposes.
+    """
 
     def _exit(arg: str | int | None) -> None:
         logger.info(f'Exiting with exit code {arg}')
@@ -323,16 +324,14 @@ def handle_unitialized_actions(urlwatch_config: CommandConfig) -> None:
                 f"'pip install -U {__project_name__}'."
             )
             return 0
-        elif new_release == '':
+        if new_release == '':
             print(' You are running the latest release.')
             return 0
-        else:
-            print(' Error contacting PyPI to determine the latest release.')
-            return 1
+        print(' Error contacting PyPI to determine the latest release.')
+        return 1
 
     def playwright_install_chrome() -> int:  # pragma: no cover
-        """
-        Replicates playwright.___main__.main() function, which is called by the playwright executable, in order to
+        """Replicates playwright.___main__.main() function, which is called by the playwright executable, in order to
         install the browser executable.
 
         :return: Playwright's executable return code.
@@ -347,7 +346,7 @@ def handle_unitialized_actions(urlwatch_config: CommandConfig) -> None:
         env['PW_CLI_TARGET_LANG'] = 'python'
         cmd = [str(driver_executable), 'install', 'chrome']
         logger.info(f'Running playwright CLI: {" ".join(cmd)}')
-        completed_process = subprocess.run(cmd, env=env, capture_output=True, text=True)  # noqa: S603
+        completed_process = subprocess.run(cmd, check=False, env=env, capture_output=True, text=True)  # noqa: S603
         if completed_process.returncode:
             print(completed_process.stderr)
             return completed_process.returncode
@@ -478,7 +477,7 @@ def main() -> None:  # pragma: no cover
     max_snapshots = command_config.max_snapshots or config_storage.config.get('database', {}).get('max_snapshots') or 4
     if database_engine == 'sqlite3':
         ssdb_storage: SsdbStorage = SsdbSQLite3Storage(command_config.ssdb_file, max_snapshots)  # storage.py
-    elif any(str(command_config.ssdb_file).startswith(prefix) for prefix in {'redis://', 'rediss://'}):
+    elif any(str(command_config.ssdb_file).startswith(prefix) for prefix in ('redis://', 'rediss://')):
         ssdb_storage = SsdbRedisStorage(command_config.ssdb_file)  # storage.py
     elif database_engine.startswith('redis'):
         ssdb_storage = SsdbRedisStorage(database_engine)