diff --git a/debian/control b/debian/control index 8851d19..fab234f 100644 --- a/debian/control +++ b/debian/control @@ -1,25 +1,25 @@ Source: swh-loader-tar Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-nose, python3-setuptools, python3-swh.core (>= 0.0.14~), python3-swh.model (>= 0.0.15~), - python3-swh.scheduler, + python3-swh.scheduler (>= 0.0.14~), python3-swh.storage (>= 0.0.83~), python3-swh.loader.dir (>= 0.0.25~), python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DLDTAR/ Package: python3-swh.loader.tar Architecture: all Depends: python3-swh.core (>= 0.0.14~), python3-swh.storage (>= 0.0.83~), - python3-swh.loader.dir (>= 0.0.25~), python3-swh.scheduler, + python3-swh.loader.dir (>= 0.0.25~), python3-swh.scheduler (>= 0.0.14~), ${misc:Depends}, ${python3:Depends} Description: Software Heritage Tarball Loader diff --git a/requirements-swh.txt b/requirements-swh.txt index 15e51e3..381df1a 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.0.14 swh.model >= 0.0.15 -swh.scheduler +swh.scheduler >= 0.0.14 swh.storage >= 0.0.83 swh.loader.dir >= 0.0.25 diff --git a/swh/loader/tar/tasks.py b/swh/loader/tar/tasks.py index cab4721..3bfd650 100644 --- a/swh/loader/tar/tasks.py +++ b/swh/loader/tar/tasks.py @@ -1,28 +1,28 @@ # 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 swh.loader.tar.loader import TarLoader class LoadTarRepository(Task): """Import a directory to Software Heritage """ task_queue = 'swh_loader_tar' - def run(self, tarpath, origin, visit_date, revision, occurrences): + def run_task(self, tarpath, origin, visit_date, revision, occurrences): """Import a tarball into swh. Args: - tarpath: path to a tarball file - origin, visit_date, revision, release, occurrences: cf. swh.loader.dir.loader.prepare docstring """ loader = TarLoader() loader.log = self.log loader.load(tarpath, origin, visit_date, revision, occurrences)