New upstream version 1.8.1

PKG-INFO

 Metadata-Version: 2.1
 Name: swh.loader.svn
-Version: 1.8.0
+Version: 1.8.1
 Summary: Software Heritage Loader SVN
 Home-page: https://forge.softwareheritage.org/diffusion/DLDSVN
 Author: Software Heritage developers
@@ -37,7 +37,7 @@ The main entry points are
 - `swh.loader.svn.loader.SvnLoaderFromRemoteDump` which mounts a repository with
   svnrdump prior to ingest its content.
 
-- `swh.loader.svn.directory.SvnDirectoryLoader` which ingests an svn tree at a specific
+- `swh.loader.svn.directory.SvnExportLoader` which ingests an svn tree at a specific
   revision.
 
 ## CLI run

README.md

@@ -15,7 +15,7 @@ The main entry points are
 - `swh.loader.svn.loader.SvnLoaderFromRemoteDump` which mounts a repository with
   svnrdump prior to ingest its content.
 
-- `swh.loader.svn.directory.SvnDirectoryLoader` which ingests an svn tree at a specific
+- `swh.loader.svn.directory.SvnExportLoader` which ingests an svn tree at a specific
   revision.
 
 ## CLI run

requirements-swh.txt

 swh.storage >= 0.11.3
 swh.model >= 6.6.0
 swh.scheduler >= 0.0.39
-swh.loader.core >= 5.6.0
+swh.loader.core >= 5.7.3

setup.py

@@ -139,6 +139,7 @@ setup(
     entry_points="""
         [swh.workers]
         loader.svn=swh.loader.svn:register
+        loader.svn-export=swh.loader.svn:register_export
     """,
     classifiers=[
         "Programming Language :: Python :: 3",

swh.loader.svn.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: swh.loader.svn
-Version: 1.8.0
+Version: 1.8.1
 Summary: Software Heritage Loader SVN
 Home-page: https://forge.softwareheritage.org/diffusion/DLDSVN
 Author: Software Heritage developers
@@ -37,7 +37,7 @@ The main entry points are
 - `swh.loader.svn.loader.SvnLoaderFromRemoteDump` which mounts a repository with
   svnrdump prior to ingest its content.
 
-- `swh.loader.svn.directory.SvnDirectoryLoader` which ingests an svn tree at a specific
+- `swh.loader.svn.directory.SvnExportLoader` which ingests an svn tree at a specific
   revision.
 
 ## CLI run

swh.loader.svn.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ swh/loader/svn/tests/test_svn_repo.py
 swh/loader/svn/tests/test_svn_retry.py
 swh/loader/svn/tests/test_task.py
 swh/loader/svn/tests/test_task_directory.py
+swh/loader/svn/tests/test_tasks.py
 swh/loader/svn/tests/test_utils.py
 swh/loader/svn/tests/utils.py
 swh/loader/svn/tests/data/httthttt.tgz

swh.loader.svn.egg-info/entry_points.txt

 [swh.workers]
 loader.svn = swh.loader.svn:register
+loader.svn-export = swh.loader.svn:register_export

swh.loader.svn.egg-info/requires.txt

@@ -6,7 +6,7 @@ typing-extensions
 swh.storage>=0.11.3
 swh.model>=6.6.0
 swh.scheduler>=0.0.39
-swh.loader.core>=5.6.0
+swh.loader.core>=5.7.3
 
 [testing]
 pytest

swh/loader/svn/__init__.py

-# Copyright (C) 2019-2021  The Software Heritage developers
+# Copyright (C) 2019-2023  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -10,6 +10,15 @@ def register() -> Dict[str, Any]:
     from swh.loader.svn.loader import SvnLoaderFromRemoteDump
 
     return {
-        "task_modules": ["%s.tasks" % __name__],
+        "task_modules": [f"{__name__}.tasks"],
         "loader": SvnLoaderFromRemoteDump,
     }
+
+
+def register_export() -> Dict[str, Any]:
+    from swh.loader.svn.directory import SvnExportLoader
+
+    return {
+        "task_modules": [],
+        "loader": SvnExportLoader,
+    }

swh/loader/svn/directory.py

@@ -15,8 +15,8 @@ from swh.loader.svn.svn_repo import SvnRepo, get_svn_repo
 from swh.model.model import Snapshot, SnapshotBranch, TargetType
 
 
-class SvnDirectoryLoader(BaseDirectoryLoader):
-    """Svn tree (directory) loader at a specific commit (revision) or tag (release) into
+class SvnExportLoader(BaseDirectoryLoader):
+    """Svn export (of a tree) loader at a specific svn revision or tag (release) into
     the swh archive.
 
     The output snapshot is of the form:

swh/loader/svn/tasks.py

@@ -8,7 +8,7 @@ from celery import shared_task
 
 from swh.loader.core.utils import parse_visit_date
 
-from .directory import SvnDirectoryLoader
+from .directory import SvnExportLoader
 from .loader import SvnLoader, SvnLoaderFromDumpArchive, SvnLoaderFromRemoteDump
 
 
@@ -47,8 +47,8 @@ def load_svn_from_remote_dump(**kwargs):
     return loader.load()
 
 
-@shared_task(name=f"{__name__}.LoadSvnDirectory")
-def load_svn_directory(**kwargs):
+@shared_task(name=f"{__name__}.LoadSvnExport")
+def load_svn_export(**kwargs):
     """Load svn tree into the swh archive."""
-    loader = SvnDirectoryLoader.from_configfile(**_process_kwargs(kwargs))
+    loader = SvnExportLoader.from_configfile(**_process_kwargs(kwargs))
     return loader.load()

swh/loader/svn/tests/test_directory.py

@@ -6,7 +6,7 @@
 import os
 
 from swh.loader.core.nar import Nar
-from swh.loader.svn.directory import SvnDirectoryLoader
+from swh.loader.svn.directory import SvnExportLoader
 from swh.loader.svn.svn_repo import get_svn_repo
 from swh.loader.tests import (
     assert_last_visit_matches,
@@ -36,7 +36,7 @@ def test_loader_svn_directory(swh_storage, datadir, tmp_path):
     svn_revision = 5
     checksums = {"sha256": compute_nar_hash_for_rev(repo_url, svn_revision)}
 
-    loader = SvnDirectoryLoader(
+    loader = SvnExportLoader(
         swh_storage,
         repo_url,
         ref=svn_revision,
@@ -78,7 +78,7 @@ def test_loader_svn_directory(swh_storage, datadir, tmp_path):
     assert len(extids) == len(checksums)
 
     # Another run on the same svn directory should be uneventful
-    loader2 = SvnDirectoryLoader(
+    loader2 = SvnExportLoader(
         swh_storage,
         repo_url,
         ref=svn_revision,
@@ -99,7 +99,7 @@ def test_loader_svn_directory_hash_mismatch(swh_storage, datadir, tmp_path):
     faulty_checksums = {
         "sha256": "00000ed1855beadfa9c00f730242f5efe3e4612e76f0dcc45215c4a3234c7466"
     }
-    loader = SvnDirectoryLoader(
+    loader = SvnExportLoader(
         swh_storage,
         repo_url,
         ref=5,
@@ -129,7 +129,7 @@ def test_loader_svn_directory_hash_mismatch(swh_storage, datadir, tmp_path):
 
 def test_loader_svn_directory_not_found(swh_storage, datadir, tmp_path):
     """Loading a svn tree from an unknown origin should fail"""
-    loader = SvnDirectoryLoader(
+    loader = SvnExportLoader(
         swh_storage,
         "file:///home/origin/does/not/exist",
         ref=5,

swh/loader/svn/tests/test_task_directory.py

@@ -44,8 +44,8 @@ def test_svn_directory_loader_for_listed_origin(
     svn_listed_svn_directory_origin.extra_loader_arguments = extra_loader_arguments
 
     loading_task_creation_for_listed_origin_test(
-        loader_class_name=f"{NAMESPACE}.directory.SvnDirectoryLoader",
-        task_function_name=f"{NAMESPACE}.tasks.LoadSvnDirectory",
+        loader_class_name=f"{NAMESPACE}.directory.SvnExportLoader",
+        task_function_name=f"{NAMESPACE}.tasks.LoadSvnExport",
         lister=svn_lister,
         listed_origin=svn_listed_svn_directory_origin,
     )

swh/loader/svn/tests/test_tasks.py

+# Copyright (C) 2023  The Software Heritage developers
+# See the AUTHORS file at the top-level directory of this distribution
+# License: GNU General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+from swh.loader.tests import assert_module_tasks_are_scheduler_ready
+
+
+def test_tasks_loader_visit_type_match_task_name():
+    import swh.loader.svn
+
+    assert_module_tasks_are_scheduler_ready([swh.loader.svn])