commit 495e2cb4689a1f122c23ea2bf685610e6c2bf58e
from: David Douard <david.douard@sdfa3.org>
date: Thu Jun 06 10:03:11 2024 UTC

Replace usage of (deprecated) dir_filter by path_filter in Directory.from_disk()

as well as in GitCheckoutLoader.

commit - 39d38c4e1ee888c5d978dd6b689987dc9ff43740
commit + 495e2cb4689a1f122c23ea2bf685610e6c2bf58e
blob - ebd34fec6c1e0a26b911455f51746230823f3b93
blob + b958ab780dbe5265b99796bc3c6b50becba3a8bc
--- swh/loader/git/directory.py
+++ swh/loader/git/directory.py
@@ -107,7 +107,7 @@ class GitCheckoutLoader(BaseDirectoryLoader):
         self.git_ref = kwargs.pop("ref")
         self.submodules = kwargs.pop("submodules", False)
         # We use a filter which ignore the .git folder and the empty git trees
-        super().__init__(*args, dir_filter=list_git_tree, **kwargs)
+        super().__init__(*args, path_filter=list_git_tree, **kwargs)
 
     def fetch_artifact(self) -> Iterator[Path]:
         with raise_not_found_repository():
blob - 04b8897a0846e94ceaa6316d6fd3ce7414b39c0d
blob + 4f4e8713c010b4e1b5e1f5c0bb4804ae25c80865
--- swh/loader/git/tests/test_directory.py
+++ swh/loader/git/tests/test_directory.py
@@ -69,7 +69,7 @@ def test_list_git_tree(datadir, tmp_path):
 
     assert empty_bar_found is True
 
-    dir2 = Directory.from_disk(path=repo_path, dir_filter=list_git_tree)
+    dir2 = Directory.from_disk(path=repo_path, path_filter=list_git_tree)
     dir2_entries = [d["name"] for d in dir2.entries]
     assert b".git" not in dir2_entries
     assert b"empty-foo" not in dir2_entries
@@ -177,8 +177,6 @@ def test_git_loader_directory(swh_storage, datadir, tm
         checksums=checksums,
     )
 
-    assert loader.dir_filter == list_git_tree
-
     actual_result = loader.load()
 
     assert actual_result == {"status": "eventful"}