jolt 0.9.350__tar.gz → 0.9.352__tar.gz

{jolt-0.9.350 → jolt-0.9.352}/PKG-INFO

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

{jolt-0.9.350 → jolt-0.9.352}/jolt/graph.py

@@ -445,7 +445,7 @@ class TaskProxy(object):
         # Exclude transitive alias and resources dependencies.
         # Workspace resources are included as they may be required by its dependencies.
         self.children = list(
-            filter(lambda n: (dag.are_neighbors(self, n) or n.is_workspace_resource()) or (not n.is_alias() and not n.is_resource()),
+            filter(lambda n: dag.are_neighbors(self, n) or (not n.is_alias() and not n.is_resource()),
                    utils.unique_list(self.children)))
 
         # Prepare workspace resources for this task so that influence can be calculated
@@ -733,8 +733,7 @@ class TaskProxy(object):
         log_prefix = False
 
         # Collect list of resource dependencies
-        resource_deps = [child for child in self.children if child.is_resource() and not child.is_workspace_resource()]
-        resource_deps_ws = [child for child in self.children if child.is_workspace_resource()]
+        resource_deps = [child for child in self.children if child.is_resource()]
 
         if self.options.worker:
             # Exclude local resources when running as worker. They are already acquired by the client.
@@ -749,7 +748,7 @@ class TaskProxy(object):
         acquired = []
         try:
             # Acquire resource dependencies in reverse order.
-            for resource in reversed(resource_deps + resource_deps_ws):
+            for resource in reversed(resource_deps):
                 with resource.lock_artifacts(discard=False) if not resource.is_workspace_resource() else nullcontext():
                     resource.deps = self.cache.get_context(resource)
                     exitstack.enter_context(resource.deps)

{jolt-0.9.350 → jolt-0.9.352}/jolt/tasks.py

@@ -20,6 +20,7 @@ import traceback
 from jolt import filesystem as fs
 from jolt import log
 from jolt import utils
+from jolt.cache import ArtifactAttributeSetProvider
 from jolt.error import raise_error_if, raise_task_error, raise_task_error_if
 from jolt.error import raise_unreported_task_error_if
 from jolt.error import JoltError, JoltCommandError, LoggedJoltError
@@ -3394,3 +3395,45 @@ class Test(Task):
             "{} tests out of {} were successful".format(
                 len(self.testresult.successes),
                 self.testresult.testsRun))
+
+
+@ArtifactAttributeSetProvider.Register
+class WorkspaceResourceAttributeSetProvider(ArtifactAttributeSetProvider):
+    def create(self, artifact):
+        pass
+
+    def parse(self, artifact, content):
+        pass
+
+    def format(self, artifact, content):
+        pass
+
+    def apply(self, task, artifact):
+        resource = artifact.task
+        node = artifact.get_node()
+        if not node.is_workspace_resource():
+            return
+
+        resource.deps = node.cache.get_context(node)
+        resource.deps.__enter__()
+
+        try:
+            resource.acquire(artifact=artifact, deps=resource.deps, tools=resource.tools, owner=task)
+        except (KeyboardInterrupt, Exception) as e:
+            if resource.release_on_error:
+                with utils.ignore_exception():
+                    self.unapply(task, artifact)
+            raise e
+
+    def unapply(self, task, artifact):
+        resource = artifact.task
+        node = artifact.get_node()
+        if not node.is_workspace_resource():
+            return
+
+        try:
+            resource.release(artifact=artifact, deps=resource.deps, tools=resource.tools, owner=task)
+        except Exception as e:
+            raise e
+
+        resource.deps.__exit__(None, None, None)

jolt-0.9.352/jolt/version.py

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

{jolt-0.9.350 → jolt-0.9.352}/jolt.egg-info/PKG-INFO

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

jolt-0.9.350/jolt/version.py

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