Version 3.34.2rc0

Author: mborsetti

.pre-commit-config.yaml

@@ -152,12 +152,11 @@ repos:
         name: check Python static typing (ty)
         entry: ty
         args: ['check']
-        language: python
-        pass_filenames: true
+        language: system
+        pass_filenames: false
         types_or: [python, pyi, jupyter]
-        exclude: storage_minidb.py
         require_serial: true
-        additional_dependencies: [ty]
+        # additional_dependencies: [ty]
       - id: cli-help
         name: update cli_help.txt (used in documentation build)
         entry: webchanges

CHANGELOG.rst

@@ -35,6 +35,15 @@ can check out the `wish list <https://github.com/mborsetti/webchanges/blob/main/
    Internals, for changes that don't affect users. [triggers a minor patch]
 
 
+Version 3.34.2rc0
+-------------------
+2026-03-21
+
+Fixed
+`````
+* Regression: Missing files in PyPi installation.
+
+
 Version 3.34.1
 -------------------
 2026-03-13

docs/inheritance_ascii_tree.py

@@ -17,7 +17,7 @@
 
 def patch_subclasses(klass: type) -> None:
     """Recursively patch webchanges classes to behave like standard python classes."""
-    klass.__subclasses__ = type.__subclasses__.__get__(klass)  # type: ignore[method-assign]
+    klass.__subclasses__ = type.__subclasses__.__get__(klass)  # ty:ignore[invalid-assignment]
 
     for kls in klass.__subclasses__():
         patch_subclasses(kls)
@@ -28,7 +28,7 @@ def build_tree(klass: type, level: int) -> Iterator[str]:
     for i, kls in enumerate(klass.__subclasses__()):
         branch = '└───' if i + 1 == len(klass.__subclasses__()) else '├───'
         indent = '│   ' * (level - 1)
-        yield ('' if level == 0 else indent + branch) + kls.__kind__  # type: ignore[attr-defined]
+        yield ('' if level == 0 else indent + branch) + kls.__kind__  # ty:ignore[unresolved-attribute]
 
         yield from build_tree(kls, level + 1)
 

pyproject.toml

@@ -101,7 +101,14 @@ all = [
 
 # 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']
+packages = [
+    'webchanges',
+    'webchanges._vendored',
+    'webchanges.filters',
+    'webchanges.jobs',
+    'webchanges.reporters',
+    'webchanges.storage'
+]
 
 [tool.setuptools.dynamic]
 version = { attr = 'webchanges.__version__' }
@@ -353,4 +360,13 @@ docstring-code-line-length = 'dynamic'
 # Config file documentation at https://docs.astral.sh/ty/reference/configuration/
 
 [tool.ty.environment]
-extra-paths = ['webchanges', 'webchanges/storage/_sqlite3.py']
+extra-paths = ['webchanges']
+
+[tool.ty.src]
+exclude = ["./webchanges/.**", "./webchanges/stora_minidb.py"]
+
+[[tool.ty.overrides]]
+include = ["./webchanges/storage/_minidb.py"]
+
+[tool.ty.overrides.rules]
+all = "ignore"

tests/data/hooks_example.py

@@ -85,14 +85,14 @@ class CustomTextFileReporter(TextReporter):
 
     __kind__ = 'custom_file'
 
-    def submit(self, **kwargs: Any) -> None:  # type: ignore[override]
-        Path(self.config['filename']).write_text('\n'.join(super().submit()))  # ty:ignore[invalid-key, invalid-argument-type]
+    def submit(self, **kwargs: Any) -> None:  # ty:ignore[invalid-method-override]
+        Path(self.config['filename']).write_text('\n'.join(super().submit()))  # ty:ignore[invalid-key]
 
 
 class CustomHtmlFileReporter(HtmlReporter):
     """Custom reporter that writes the HTML report to a file."""
 
     __kind__ = 'custom_html'
 
-    def submit(self, **kwargs: Any) -> None:  # type: ignore[override]
-        Path(self.config['filename']).write_text('\n'.join(super().submit()))  # ty:ignore[invalid-key, invalid-argument-type]
+    def submit(self, **kwargs: Any) -> None:  # ty:ignore[invalid-method-override]
+        Path(self.config['filename']).write_text('\n'.join(super().submit()))  # ty:ignore[invalid-key]

tests/test_command.py

@@ -70,7 +70,7 @@ def new_command_config(jobs_file: Path = jobs_file, hooks_file: Path = hooks_fil
         config_file=config_file,
         jobs_def_file=jobs_file,
         hooks_def_file=hooks_file,
-        ssdb_file=ssdb_file,  # type: ignore[arg-type]
+        ssdb_file=ssdb_file,  # ty:ignore[invalid-argument-type]
     )
 
 
@@ -85,10 +85,10 @@ def urlwatch_command() -> Generator[UrlwatchCommand, None, None]:
             config_file=config_file,
             jobs_def_file=jobs_file,
             hooks_def_file=hooks_file,
-            ssdb_file=':memory:',  # type: ignore[arg-type]
+            ssdb_file=':memory:',  # ty:ignore[invalid-argument-type]
         ),
         config_storage=config_storage,
-        ssdb_storage=SsdbSQLite3Storage(':memory:'),  # type: ignore[arg-type]
+        ssdb_storage=SsdbSQLite3Storage(':memory:'),  # ty:ignore[invalid-argument-type]
         jobs_storage=YamlJobsStorage([jobs_file]),
     )  # main.py
     yield UrlwatchCommand(urlwatcher)
@@ -102,7 +102,7 @@ def urlwatch_command() -> Generator[UrlwatchCommand, None, None]:
 command_config = new_command_config(jobs_file=jobs_file)
 config_storage = YamlConfigStorage(config_file)
 config_storage.load()
-snapshot_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+snapshot_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
 jobs_storage = YamlJobsStorage([jobs_file])
 urlwatcher = Urlwatch(command_config, config_storage, snapshot_storage, jobs_storage)  # main.py
 urlwatch_command_common = UrlwatchCommand(urlwatcher)
@@ -164,7 +164,7 @@ def test_migration() -> None:
         config_file,
         jobs_file,
         hooks_file,
-        ssdb_file,  # type: ignore[arg-type]
+        ssdb_file,  # ty:ignore[invalid-argument-type]
     )
 
 
@@ -178,7 +178,7 @@ def test_first_run(capsys: pytest.CaptureFixture[str], tmp_path: Path) -> None:
         config_file2,
         jobs_file2,
         hooks_file,
-        ssdb_file,  # type: ignore[arg-type]
+        ssdb_file,  # ty:ignore[invalid-argument-type]
     )
     command_config2.edit = False
     first_run(command_config2)
@@ -192,7 +192,7 @@ def test_load_hooks_file_warning(recwarn: pytest.WarningsRecorder) -> None:
     hooks_file2 = tmp_path.joinpath('hooks_does_not_exist.py')
     load_hooks(hooks_file2, is_default=False)
     assert len(recwarn) == 1
-    message = recwarn.pop(RuntimeWarning).message.args[0]  # type: ignore[union-attr]
+    message = recwarn.pop(RuntimeWarning).message.args[0]  # ty:ignore[unresolved-attribute]
     assert message == f'Hooks file {hooks_file2} not imported because it does not exist or is not a file'
 
 
@@ -763,7 +763,7 @@ def test_modify_urls_move_location(
     # run jobs to save
     urlwatcher2.run_jobs()
     if hasattr(ssdb_storage2, '_copy_temp_to_permanent'):
-        ssdb_storage2._copy_temp_to_permanent(delete=True)  # type: ignore[attr-defined]
+        ssdb_storage2._copy_temp_to_permanent(delete=True)  # ty:ignore[call-non-callable]
 
     # try changing job database location
     command_config2.change_location = old_loc, new_loc
@@ -915,7 +915,7 @@ def test_gc_database(capsys: pytest.CaptureFixture[str], monkeypatch: pytest.Mon
 def test_clean_database(capsys: pytest.CaptureFixture[str]) -> None:
     """Test --clean-database [RETAIN_LIMIT]."""
     command_config.clean_database = True
-    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     with pytest.raises(SystemExit) as pytest_wrapped_se:
         urlwatch_command_common.handle_actions()
     command_config.clean_database = None
@@ -924,7 +924,7 @@ def test_clean_database(capsys: pytest.CaptureFixture[str]) -> None:
     assert message == ''
 
     # set up storage for testing
-    database_engine = SsdbSQLite3Storage(':memory:')  # type: ignore[arg-type]
+    database_engine = SsdbSQLite3Storage(':memory:')  # ty:ignore[invalid-argument-type]
     urlwatcher2, ssdb_storage2, command_config2 = prepare_storage_test(database_engine)
     urlwatch_command2 = UrlwatchCommand(urlwatcher2)
 
@@ -933,13 +933,13 @@ def test_clean_database(capsys: pytest.CaptureFixture[str]) -> None:
         time.sleep(0.0001)
         urlwatch_command2.urlwatcher.run_jobs()
     if hasattr(ssdb_storage2, '_copy_temp_to_permanent'):
-        ssdb_storage2._copy_temp_to_permanent(delete=True)  # type: ignore[attr-defined]
+        ssdb_storage2._copy_temp_to_permanent(delete=True)  # ty:ignore[call-non-callable]
 
     # clean database with RETAIN_LIMIT=2
     urlwatch_command2.urlwatch_config.clean_database = 2
     urlwatcher2.ssdb_storage.clean_ssdb(
         [job.guid for job in urlwatcher2.jobs],
-        command_config2.clean_database,  # type: ignore[arg-type]
+        command_config2.clean_database,  # ty:ignore[invalid-argument-type]
     )
     urlwatch_command2.urlwatch_config.clean_database = None
     guid = urlwatch_command2.urlwatcher.jobs[0].guid
@@ -949,7 +949,7 @@ def test_clean_database(capsys: pytest.CaptureFixture[str]) -> None:
     urlwatch_command2.urlwatch_config.clean_database = True
     urlwatcher2.ssdb_storage.clean_ssdb(
         [job.guid for job in urlwatcher2.jobs],
-        command_config2.clean_database,  # type: ignore[arg-type]
+        command_config2.clean_database,  # ty:ignore[invalid-argument-type]
     )
     urlwatch_command2.urlwatch_config.clean_database = None
     guid = urlwatch_command2.urlwatcher.jobs[0].guid
@@ -960,7 +960,7 @@ def test_rollback_database(capsys: pytest.CaptureFixture[str], monkeypatch: pyte
     # monkeypatches the "input" function, so that it simulates the user entering "y" in the terminal:
     monkeypatch.setattr('builtins.input', lambda _: 'y')
 
-    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     command_config.rollback_database = '1'
     with pytest.raises(SystemExit) as pytest_wrapped_se:
         urlwatch_command_common.handle_actions()
@@ -969,7 +969,7 @@ def test_rollback_database(capsys: pytest.CaptureFixture[str], monkeypatch: pyte
     message = capsys.readouterr().out
     assert 'No snapshots found after' in message
 
-    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     command_config.rollback_database = '10am'
     with pytest.raises(SystemExit) as pytest_wrapped_se:
         urlwatch_command_common.handle_actions()
@@ -978,7 +978,7 @@ def test_rollback_database(capsys: pytest.CaptureFixture[str], monkeypatch: pyte
     message = capsys.readouterr().out
     assert 'No snapshots found after' in message
 
-    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    urlwatcher.ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     command_config.rollback_database = 'Thisisjunk'
     with pytest.raises(ValueError) as pytest_wrapped_ve:
         urlwatch_command_common.handle_actions()
@@ -1194,7 +1194,7 @@ def test_locate_storage_file() -> None:
 
 def test_job_states_verb() -> None:
     jobs_file = config_path.joinpath('jobs-time.yaml')
-    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     jobs_storage = YamlJobsStorage([jobs_file])
     command_config = new_command_config(jobs_file=jobs_file)
     urlwatcher = Urlwatch(command_config, config_storage, ssdb_storage, jobs_storage)  # main.py
@@ -1213,7 +1213,7 @@ def test_job_states_verb() -> None:
 
 def test_job_states_verb_notimestamp_unchanged() -> None:
     jobs_file = config_path.joinpath('jobs-time.yaml')
-    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     jobs_storage = YamlJobsStorage([jobs_file])
     command_config = new_command_config(jobs_file=jobs_file)
     urlwatcher = Urlwatch(command_config, config_storage, ssdb_storage, jobs_storage)  # main.py
@@ -1249,7 +1249,7 @@ def test_job_states_verb_notimestamp_unchanged() -> None:
 
 def test_job_states_verb_notimestamp_changed() -> None:
     jobs_file = config_path.joinpath('jobs-time.yaml')
-    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     jobs_storage = YamlJobsStorage([jobs_file])
     command_config = new_command_config(jobs_file=jobs_file)
     urlwatcher = Urlwatch(command_config, config_storage, ssdb_storage, jobs_storage)  # main.py

tests/test_differs.py

@@ -112,7 +112,7 @@ def generate_random_string(length: int = 39) -> str:
 def job_state() -> Generator[JobState, None, None]:
     """Get a JobState object for testing."""
     ssdb_file = ':memory:'
-    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # type: ignore[arg-type]
+    ssdb_storage = SsdbSQLite3Storage(ssdb_file)  # ty:ignore[invalid-argument-type]
     job_state = JobState(ssdb_storage, ShellJob(command=''))
     job_state.old_timestamp = 1605147837.511478  # initial release of webchanges!
     job_state.new_timestamp = 1605147837.511478

tests/test_docs_filters.py

@@ -144,8 +144,8 @@ def test_jobs(job: JobBase) -> None:
     expected_output_data = d['output']
 
     # noinspection PyTypeChecker
-    with JobState(None, job) as job_state:  # type: ignore[arg-type]
-        for filter_kind, subfilter in FilterBase.normalize_filter_list(job_state.job.filters):
+    with JobState(None, job) as job_state:  # ty:ignore[invalid-argument-type]
+        for filter_kind, subfilter in FilterBase.normalize_filter_list(job_state.job.filters):  # ty:ignore[invalid-argument-type]
             if (
                 filter_kind == 'beautify' or (filter_kind == 'html2text' and subfilter.get('method') == 'bs4')
             ) and not bs4_is_installed:

tests/test_docs_hooks.py

@@ -149,9 +149,9 @@ def test_url(job: JobBase) -> None:
     d = testdata[job.url]
     data = d['input']
     # noinspection PyTypeChecker
-    with JobState(None, job) as job_state:  # type: ignore[arg-type]
+    with JobState(None, job) as job_state:  # ty:ignore[invalid-argument-type]
         data, _ = FilterBase.auto_process(job_state, data, '')
-        for filter_kind, subfilter in FilterBase.normalize_filter_list(job_state.job.filters):
+        for filter_kind, subfilter in FilterBase.normalize_filter_list(job_state.job.filters):  # ty:ignore[invalid-argument-type]
             data, _ = FilterBase.process(filter_kind, subfilter, job_state, data, '')
 
         expected_output_data = d['output']