jolt 0.9.349__tar.gz → 0.9.352__tar.gz

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

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

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

@@ -216,7 +216,7 @@ class TaskProxy(object):
         for c in self.children:
             if c.is_resource() or c.is_alias():
                 continue
-            if not c.is_available_locally():
+            if not c.is_available_locally(persistent_only=True):
                 return False
         return True
 
@@ -335,16 +335,32 @@ class TaskProxy(object):
         self._download = False
 
     def download(self, force=False, session_only=False, persistent_only=False):
+        """
+        Downloads all artifacts of this task.
+
+        If the task is not downloadable, the method returns True. Failure to
+        download persistent artifacts is considered a failure, and the method
+        returns False. Session artifacts are not required to be downloaded.
+
+        :param force: Force download even if the artifacts are already available.
+        :param session_only: Download only session artifacts.
+        :param persistent_only: Download only persistent artifacts.
+
+        """
         if not force and not self.is_downloadable():
             return True
+        success = True
         artifacts = self._artifacts
-        if session_only:
-            artifacts = list(filter(lambda a: a.is_session(), artifacts))
-        if persistent_only:
-            artifacts = list(filter(lambda a: not a.is_session(), artifacts))
-        if not artifacts:
-            return True
-        return all([self.cache.download(artifact, force=force) for artifact in artifacts])
+        artifacts_session = list(filter(lambda a: a.is_session(), artifacts))
+        artifacts_persistent = list(filter(lambda a: not a.is_session(), artifacts))
+        download_all = not session_only and not persistent_only
+        if session_only or download_all:
+            for artifact in artifacts_session:
+                if not self.cache.download(artifact, force=force):
+                    self.warning("Failed to download session artifact: {}", artifact.identity)
+        if persistent_only or download_all:
+            success = all([self.cache.download(artifact, force=force) for artifact in artifacts_persistent])
+        return success
 
     def upload(self, force=False, locked=False, session_only=False, persistent_only=False, artifacts=None):
         artifacts = artifacts or self._artifacts
@@ -429,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
@@ -717,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.
@@ -733,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.349 → 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.349 → jolt-0.9.352}/jolt.egg-info/PKG-INFO

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

jolt-0.9.349/jolt/version.py

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