Replace *args in cluster classes by scheduler and name parameter (#387)

dask_jobqueue/core.py

@@ -502,7 +502,7 @@ def _dummy_job(self):
         except AttributeError:
             address = "tcp://<insert-scheduler-address-here>:8786"
         return self.job_cls(
-            address or "tcp://<insert-scheduler-address-here>:8786",
+            scheduler=address or "tcp://<insert-scheduler-address-here>:8786",
             name="name",
             **self._kwargs
         )

dask_jobqueue/htcondor.py

@@ -33,8 +33,18 @@ class HTCondorJob(Job):
 
     config_name = "htcondor"
 
-    def __init__(self, *args, disk=None, job_extra=None, config_name=None, **kwargs):
-        super().__init__(*args, config_name=config_name, **kwargs)
+    def __init__(
+        self,
+        scheduler=None,
+        name=None,
+        disk=None,
+        job_extra=None,
+        config_name=None,
+        **kwargs
+    ):
+        super().__init__(
+            scheduler=scheduler, name=name, config_name=config_name, **kwargs
+        )
 
         if disk is None:
             disk = dask.config.get("jobqueue.%s.disk" % self.config_name)

dask_jobqueue/local.py

@@ -26,7 +26,8 @@ class LocalJob(Job):
 
     def __init__(
         self,
-        *args,
+        scheduler=None,
+        name=None,
         queue=None,
         project=None,
         resource_spec=None,
@@ -36,7 +37,13 @@ def __init__(
         **kwargs
     ):
         # Instantiate args and parameters from parent abstract class
-        super().__init__(*args, config_name=config_name, shebang="", **kwargs)
+        super().__init__(
+            scheduler=scheduler,
+            name=name,
+            config_name=config_name,
+            shebang="",
+            **kwargs
+        )
 
         # Declare class attribute that shall be overridden
         self.job_header = ""

dask_jobqueue/lsf.py

@@ -21,7 +21,8 @@ class LSFJob(Job):
 
     def __init__(
         self,
-        *args,
+        scheduler=None,
+        name=None,
         queue=None,
         project=None,
         ncpus=None,
@@ -33,7 +34,9 @@ def __init__(
         use_stdin=None,
         **kwargs
     ):
-        super().__init__(*args, config_name=config_name, **kwargs)
+        super().__init__(
+            scheduler=scheduler, name=name, config_name=config_name, **kwargs
+        )
 
         if queue is None:
             queue = dask.config.get("jobqueue.%s.queue" % self.config_name)

dask_jobqueue/oar.py

@@ -18,7 +18,8 @@ class OARJob(Job):
 
     def __init__(
         self,
-        *args,
+        scheduler=None,
+        name=None,
         queue=None,
         project=None,
         resource_spec=None,
@@ -27,7 +28,9 @@ def __init__(
         config_name=None,
         **kwargs
     ):
-        super().__init__(*args, config_name=config_name, **kwargs)
+        super().__init__(
+            scheduler=scheduler, name=name, config_name=config_name, **kwargs
+        )
 
         if queue is None:
             queue = dask.config.get("jobqueue.%s.queue" % self.config_name)

dask_jobqueue/pbs.py

@@ -41,7 +41,8 @@ class PBSJob(Job):
 
     def __init__(
         self,
-        *args,
+        scheduler=None,
+        name=None,
         queue=None,
         project=None,
         resource_spec=None,
@@ -50,7 +51,9 @@ def __init__(
         config_name=None,
         **kwargs
     ):
-        super().__init__(*args, config_name=config_name, **kwargs)
+        super().__init__(
+            scheduler=scheduler, name=name, config_name=config_name, **kwargs
+        )
 
         if queue is None:
             queue = dask.config.get("jobqueue.%s.queue" % self.config_name)

dask_jobqueue/sge.py

@@ -14,7 +14,8 @@ class SGEJob(Job):
 
     def __init__(
         self,
-        *args,
+        scheduler=None,
+        name=None,
         queue=None,
         project=None,
         resource_spec=None,
@@ -23,7 +24,9 @@ def __init__(
         config_name=None,
         **kwargs
     ):
-        super().__init__(*args, config_name=config_name, **kwargs)
+        super().__init__(
+            scheduler=scheduler, name=name, config_name=config_name, **kwargs
+        )
 
         if queue is None:
             queue = dask.config.get("jobqueue.%s.queue" % self.config_name)

dask_jobqueue/slurm.py

@@ -16,7 +16,8 @@ class SLURMJob(Job):
 
     def __init__(
         self,
-        *args,
+        scheduler=None,
+        name=None,
         queue=None,
         project=None,
         walltime=None,
@@ -26,7 +27,9 @@ def __init__(
         config_name=None,
         **kwargs
     ):
-        super().__init__(*args, config_name=config_name, **kwargs)
+        super().__init__(
+            scheduler=scheduler, name=name, config_name=config_name, **kwargs
+        )
 
         if queue is None:
             queue = dask.config.get("jobqueue.%s.queue" % self.config_name)