From af60301f3ad62096fcabe312eb3d5c5a13ba7b63 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Mon, 12 Jun 2017 15:40:28 +0200
Subject: [PATCH] tasks: update to new swh.scheduler API

---
 debian/control           |  4 ++--
 requirements-swh.txt     |  2 +-
 swh/lister/core/tasks.py | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 9382704..59ae2e7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                python3-nose,
                python3-setuptools,
                python3-swh.core,
-               python3-swh.scheduler (>= 0.0.10~),
+               python3-swh.scheduler (>= 0.0.14~),
                python3-swh.storage (>= 0.0.76~),
                python3-vcversioner
 Standards-Version: 3.9.6
@@ -17,7 +17,7 @@ Homepage: https://forge.softwareheritage.org/diffusion/DLSGH/
 
 Package: python3-swh.lister.github
 Architecture: all
-Depends: python3-swh.scheduler (>= 0.0.10~),
+Depends: python3-swh.scheduler (>= 0.0.14~),
          python3-swh.storage (>= 0.0.76~),
          ${misc:Depends},
          ${python3:Depends}
diff --git a/requirements-swh.txt b/requirements-swh.txt
index 7338698..a6b75b4 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,3 +1,3 @@
 swh.core
 swh.storage >= 0.0.76
-swh.scheduler >= 0.0.10
+swh.scheduler >= 0.0.14
diff --git a/swh/lister/core/tasks.py b/swh/lister/core/tasks.py
index 76f6e01..4ab610a 100644
--- a/swh/lister/core/tasks.py
+++ b/swh/lister/core/tasks.py
@@ -44,26 +44,26 @@ class ListerTaskBase(Task, metaclass=AbstractTaskMeta):
         pass
 
     @abc.abstractmethod
-    def run(self):
+    def run_task(self):
         pass
 
 
 class IndexingDiscoveryListerTask(ListerTaskBase):
-    def run(self):
+    def run_task(self):
         lister = self.new_lister()
-        lister.run(min_index=lister.db_last_index(), max_index=None)
+        return lister.run(min_index=lister.db_last_index(), max_index=None)
 
 
 class IndexingRangeListerTask(ListerTaskBase):
-    def run(self, start, end):
+    def run_task(self, start, end):
         lister = self.new_lister()
-        lister.run(min_index=start, max_index=end)
+        return lister.run(min_index=start, max_index=end)
 
 
 class IndexingRefreshListerTask(ListerTaskBase):
     GROUP_SPLIT = 10000
 
-    def run(self):
+    def run_task(self):
         lister = self.new_lister()
         ranges = lister.db_partition_indices(self.GROUP_SPLIT)
         random.shuffle(ranges)