diff --git a/debian/control b/debian/control index b1c1ee6..53bcbf0 100644 --- a/debian/control +++ b/debian/control @@ -1,23 +1,28 @@ Source: swh-loader-dir 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.loader.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.core (>= 0.0.14~), python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DLDDIR/ Package: python3-swh.loader.dir Architecture: all -Depends: python3-swh.core (>= 0.0.14~), python3-swh.model (>= 0.0.15~), python3-swh.scheduler, - python3-swh.storage (>= 0.0.83~), python3-swh.loader.core (>= 0.0.14~), ${misc:Depends}, ${python3:Depends} +Depends: python3-swh.core (>= 0.0.14~), + python3-swh.loader.core (>= 0.0.14~), + python3-swh.model (>= 0.0.15~), + python3-swh.scheduler (>= 0.0.14~), + python3-swh.storage (>= 0.0.83~), + ${misc:Depends}, + ${python3:Depends} Description: Software Heritage Directory Loader diff --git a/requirements-swh.txt b/requirements-swh.txt index 0fdb18f..6eb25c7 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.core >= 0.0.14 diff --git a/swh/loader/dir/tasks.py b/swh/loader/dir/tasks.py index 6333b92..42f7634 100644 --- a/swh/loader/dir/tasks.py +++ b/swh/loader/dir/tasks.py @@ -1,25 +1,25 @@ # Copyright (C) 2015-2016 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.dir.loader import DirLoader from swh.scheduler.task import Task class LoadDirRepository(Task): """Import a directory to Software Heritage """ task_queue = 'swh_loader_dir' - def run(self, dir_path, origin, visit_date, revision, release, - occurrences): + def run_task(self, dir_path, origin, visit_date, revision, release, + occurrences): """Import a directory dir_path with origin at visit_date time. Providing the revision, release, and occurrences. """ loader = DirLoader() loader.log = self.log loader.load(dir_path, origin, visit_date, revision, release, occurrences)