jolt 0.9.370__tar.gz → 0.9.373__tar.gz

{jolt-0.9.370 → jolt-0.9.373}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jolt
-Version: 0.9.370
+Version: 0.9.373
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

{jolt-0.9.370 → jolt-0.9.373}/jolt/cli.py

@@ -374,9 +374,11 @@ def build(ctx, task, network, keep_going, default, local,
             debug=debug)
 
         with progress:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
                 # Find all tasks ready to be executed
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 # Order the tasks by their weights to improve build times
                 leafs.sort(key=lambda x: x.weight)
@@ -385,6 +387,7 @@ def build(ctx, task, network, keep_going, default, local,
                     task = leafs.pop()
                     executor = strategy.create_executor(session, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, error = queue.wait()
 
@@ -745,13 +748,16 @@ def download(ctx, task, deps, copy, copy_all):
 
     try:
         with log.progress("Progress", dag.number_of_tasks(), " tasks", estimates=False, debug=False) as p:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 while leafs:
                     task = leafs.pop()
                     executor = strategy.create_executor({}, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, error = queue.wait()
                 p.update(1)

{jolt-0.9.370 → jolt-0.9.373}/jolt/plugins/docker.py

@@ -254,7 +254,7 @@ class DockerContainer(Resource):
     def _image(self):
         registry = TaskRegistry.get()
         tool = tools.Tools(self)
-        if registry.get_task(tool.expand(self.image)):
+        if registry.has_task(tool.expand(self.image)):
             return [self.image]
         return []
 

{jolt-0.9.370 → jolt-0.9.373}/jolt/plugins/gdb.py

@@ -86,13 +86,16 @@ def gdb(ctx, task, default, machine_interface, no_binary, gdb_args):
 
     try:
         with log.progress("Progress", dag.number_of_tasks(), " tasks", estimates=False, debug=False) as p:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 while leafs:
                     task = leafs.pop()
                     executor = strategy.create_executor({}, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, _ = queue.wait()
 

{jolt-0.9.370 → jolt-0.9.373}/jolt/plugins/ninja-compdb.py

@@ -242,8 +242,10 @@ def compdb(ctx, task, default):
 
     try:
         with log.progress("Progress", dag.number_of_tasks(), " tasks", estimates=False, debug=False) as progress:
+            in_progress = set()
+
             while dag.has_tasks() or not queue.empty():
-                leafs = dag.select(lambda graph, task: task.is_ready())
+                leafs = dag.select(lambda graph, task: task.is_ready() and task not in in_progress)
 
                 # Order the tasks by their weights to improve build times
                 leafs.sort(key=lambda x: x.weight)
@@ -252,6 +254,7 @@ def compdb(ctx, task, default):
                     task = leafs.pop()
                     executor = strategy.create_executor({}, task)
                     queue.submit(executor)
+                    in_progress.add(task)
 
                 task, _ = queue.wait()
 

{jolt-0.9.370 → jolt-0.9.373}/jolt/plugins/podman.py

@@ -247,7 +247,7 @@ class Container(Resource):
     def _image(self):
         registry = TaskRegistry.get()
         tool = tools.Tools(self)
-        if registry.get_task(tool.expand(self.image)):
+        if registry.has_task(tool.expand(self.image)):
             return [self.image]
         return []
 

{jolt-0.9.370 → jolt-0.9.373}/jolt/tasks.py

@@ -847,6 +847,10 @@ class TaskRegistry(object):
 
         raise_task_error_if(not task, full_name, "No such task")
 
+    def has_task(self, name):
+        name, params = utils.parse_task_name(name)
+        return self.tasks.get(name) is not None
+
     def set_default_parameters(self, task):
         name, params = utils.parse_task_name(task)
 

jolt-0.9.373/jolt/version.py

@@ -0,0 +1 @@
+__version__ = "0.9.373"

{jolt-0.9.370 → jolt-0.9.373}/jolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jolt
-Version: 0.9.370
+Version: 0.9.373
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

jolt-0.9.370/jolt/version.py

@@ -1 +0,0 @@
-__version__ = "0.9.370"