New upstream version 0.0.52

PKG-INFO

 Metadata-Version: 1.0
 Name: swh.deposit
-Version: 0.0.51
+Version: 0.0.52
 Summary: Software Heritage Deposit Server
 Home-page: https://forge.softwareheritage.org/source/swh-deposit/
 Author: Software Heritage developers

debian/control

@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
                python3-swh.model (>= 0.0.21~),
                python3-swh.loader.core (>= 0.0.32~),
                python3-swh.loader.tar (>= 0.0.35~),
-               python3-swh.scheduler (>= 0.0.19~),
+               python3-swh.scheduler (>= 0.0.26~),
                python3-django,
                python3-click,
                python3-vcversioner,
@@ -29,7 +29,7 @@ Package: python3-swh.deposit
 Architecture: all
 Depends: python3-swh.core (>= 0.0.36~),
          python3-swh.model (>= 0.0.21~),
-         python3-swh.scheduler (>= 0.0.19~),
+         python3-swh.scheduler (>= 0.0.26~),
          patool,
          ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Deposit Server
@@ -51,6 +51,6 @@ Depends: python3-swh.deposit.client (= ${binary:Version}),
          python3-swh.model (>= 0.0.21~),
          python3-swh.loader.core (>= 0.0.32~),
          python3-swh.loader.tar (>= 0.0.35~),
-         python3-swh.scheduler (>= 0.0.19~),
+         python3-swh.scheduler (>= 0.0.26~),
          ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Deposit Loader

requirements-swh.txt

 swh.core >= 0.0.36
 swh.loader.tar >= 0.0.35
 swh.loader.core >= 0.0.32
-swh.scheduler >= 0.0.19
+swh.scheduler >= 0.0.26
 swh.model >= 0.0.21

swh.deposit.egg-info/PKG-INFO

 Metadata-Version: 1.0
 Name: swh.deposit
-Version: 0.0.51
+Version: 0.0.52
 Summary: Software Heritage Deposit Server
 Home-page: https://forge.softwareheritage.org/source/swh-deposit/
 Author: Software Heritage developers

swh.deposit.egg-info/requires.txt

@@ -7,5 +7,5 @@ swh.core>=0.0.36
 swh.loader.core>=0.0.32
 swh.loader.tar>=0.0.35
 swh.model>=0.0.21
-swh.scheduler>=0.0.19
+swh.scheduler>=0.0.26
 vcversioner

swh/deposit/config.py

@@ -7,6 +7,7 @@ import os
 import logging
 
 from swh.core.config import SWHConfig
+from swh.scheduler import get_scheduler
 
 # IRIs (Internationalized Resource identifier) sword 2.0 specified
 EDIT_SE_IRI = 'edit_se_iri'
@@ -78,6 +79,12 @@ class SWHDefaultConfig(SWHConfig):
     DEFAULT_CONFIG = {
         'max_upload_size': ('int', 209715200),
         'checks': ('bool', True),
+        'scheduler': ('dict', {
+            'cls': 'remote',
+            'args': {
+                'url': 'http://localhost:5008/'
+            }
+        })
     }
 
     ADDITIONAL_CONFIG = {}
@@ -89,5 +96,4 @@ class SWHDefaultConfig(SWHConfig):
         self.config.update(config)
         self.log = logging.getLogger('swh.deposit')
         if self.config['checks']:
-            from swh.scheduler.backend import SchedulerBackend
-            self.scheduler = SchedulerBackend()
+            self.scheduler = get_scheduler(**self.config['scheduler'])

swh/deposit/loader/scheduler.py

@@ -103,15 +103,22 @@ class SWHSchedulerScheduling(SWHScheduling):
     """Deposit loading through SWH's task scheduling interface.
 
     """
-    ADDITIONAL_CONFIG = {}
+    ADDITIONAL_CONFIG = {
+        'scheduler': ('dict', {
+            'cls': 'remote',
+            'args': {
+                'url': 'http://localhost:5008',
+            }
+        })
+    }
 
     def __init__(self, config=None):
         super().__init__()
-        from swh.scheduler.backend import SchedulerBackend
+        from swh.scheduler import get_scheduler
         if config:
             self.config.update(**config)
         self.dry_run = self.config['dry_run']
-        self.scheduler = SchedulerBackend(**self.config)
+        self.scheduler = get_scheduler(**self.config['scheduler'])
         self.check = self.config['check']
 
     def _convert(self, deposits):

swh/deposit/settings/development.py

@@ -14,7 +14,7 @@ SECRET_KEY = 'development-key'
 # https://docs.djangoproject.com/en/1.10/ref/settings/#logging
 LOGGING = {
     'version': 1,
-    'disable_existing_loggers': True,
+    'disable_existing_loggers': False,
     'formatters': {
         'standard': {
             'format': "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s",  # noqa

version.txt

-v0.0.51-0-g735b248
\ No newline at end of file
+v0.0.52-0-g7e535ab
\ No newline at end of file