diff --git a/debian/control b/debian/control index 87b427c..7ff5e57 100644 --- a/debian/control +++ b/debian/control @@ -1,35 +1,35 @@ Source: swh-loader-svn Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-click, python3-dateutil, python3-nose, python3-retrying, python3-setuptools, python3-subvertpy (>= 0.9.4~), python3-swh.core (>= 0.0.19~), python3-swh.loader.core (>= 0.0.14~), python3-swh.model (>= 0.0.15~), - python3-swh.scheduler (>= 0.0.11~), + python3-swh.scheduler (>= 0.0.14~), python3-swh.storage (>= 0.0.83~), python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DLDSVN/ Package: python3-swh.loader.svn Architecture: all Depends: gzip, python3-swh.core (>= 0.0.19~), python3-swh.loader.core (>= 0.0.14~), python3-swh.model (>= 0.0.15~), - python3-swh.scheduler (>= 0.0.11~), + python3-swh.scheduler (>= 0.0.14~), python3-swh.storage (>= 0.0.83~), subversion, ${misc:Depends}, ${python3:Depends} Description: Software Heritage Loader Svn Module in charge of loading svn repositories into swh storage. diff --git a/requirements-swh.txt b/requirements-swh.txt index 1a818ed..e4ff45d 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.0.19 swh.storage >= 0.0.83 swh.model >= 0.0.15 -swh.scheduler >= 0.0.11 +swh.scheduler >= 0.0.14 swh.loader.core >= 0.0.14 diff --git a/swh/loader/svn/tasks.py b/swh/loader/svn/tasks.py index 660fa12..65009a2 100644 --- a/swh/loader/svn/tasks.py +++ b/swh/loader/svn/tasks.py @@ -1,51 +1,51 @@ # Copyright (C) 2015-2017 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.scheduler.task import Task from .loader import SWHSvnLoader, SWHSvnLoaderFromDumpArchive class LoadSWHSvnRepositoryTsk(Task): """Import one svn repository to Software Heritage. """ task_queue = 'swh_loader_svn' - def run(self, *args, **kwargs): + def run_task(self, *args, **kwargs): """Import a svn repository with swh policy. Args: args: ordered arguments (expected None) kwargs: Dictionary with the following expected keys: - svn_url: (mandatory) svn's repository url - destination_path: (mandatory) root directory to locally retrieve svn's data - swh_revision: (optional) extra SWH revision hex to start from. cf. swh.loader.svn.SvnLoader.process docstring """ loader = SWHSvnLoader() loader.log = self.log loader.load(*args, **kwargs) class MountAndLoadSvnRepositoryTsk(Task): task_queue = 'swh_loader_svn_mount_and_load' - def run(self, archive_path, origin_url=None, visit_date=None): + def run_task(self, archive_path, origin_url=None, visit_date=None): """1. Mount an svn dump from archive as a local svn repository. 2. Load it through the svn loader. 3. Clean up mounted svn repository archive. """ loader = SWHSvnLoaderFromDumpArchive(archive_path) loader.log = self.log loader.load(svn_url='file://%s' % loader.repo_path, origin_url=origin_url, visit_date=visit_date, destination_path=None)