jolt 0.9.347__tar.gz → 0.9.350__tar.gz

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

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

{jolt-0.9.347 → jolt-0.9.350}/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
@@ -426,9 +442,10 @@ class TaskProxy(object):
                 self.children.extend(n.children)
             n.ancestors.add(self)
 
-        # Exclude transitive alias and resources dependencies
+        # Exclude transitive alias and resources dependencies.
+        # Workspace resources are included as they may be required by its dependencies.
         self.children = list(
-            filter(lambda n: not n.is_alias() and (not n.is_resource() or dag.are_neighbors(self, n)),
+            filter(lambda n: (dag.are_neighbors(self, n) or n.is_workspace_resource()) 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

{jolt-0.9.347 → jolt-0.9.350}/jolt/plugins/git.py

@@ -43,7 +43,6 @@ class GitRepository(object):
         self._tree_hash = {}
         self._original_head = True
         self._last_rev = None
-        self._lock = RLock()
         self._init_repo()
 
     def _init_repo(self):
@@ -77,7 +76,6 @@ class GitRepository(object):
     def is_indexed(self):
         return self.is_cloned() and fs.path.exists(self._git_index())
 
-    @locked
     def clone(self):
         log.info("Cloning into {0}", self.path)
 
@@ -127,7 +125,6 @@ class GitRepository(object):
             "Failed to clone repository '{0}'", self.relpath)
 
     @utils.cached.instance
-    @locked
     def diff_unchecked(self):
         if not self.is_indexed():
             return ""
@@ -141,7 +138,6 @@ class GitRepository(object):
                                   output_on_error=True,
                                   output_rstrip=False)
 
-    @locked
     def diff(self):
         diff = self.diff_unchecked()
         dlim = config.getsize("git", "maxdiffsize", "1 MiB")
@@ -151,7 +147,6 @@ class GitRepository(object):
             .format(self.relpath, len(diff), dlim))
         return diff
 
-    @locked
     def patch(self, patch):
         if not patch:
             return
@@ -162,7 +157,6 @@ class GitRepository(object):
             log.info("Applying patch to {0}", self.path)
             self.tools.run("git apply --whitespace=nowarn {patchfile}", patchfile=patchfile)
 
-    @locked
     def head(self):
         if not self.is_cloned():
             return None
@@ -206,7 +200,6 @@ class GitRepository(object):
                 output_on_error=True)
         return tree
 
-    @locked
     def tree_hash(self, rev=None, path="/"):
         # When rev is None, the caller want the tree hash of the repository's
         # current workspace state. If no checkout has been made, that would be the
@@ -246,17 +239,14 @@ class GitRepository(object):
 
         return value
 
-    @locked
     def clean(self):
         with self.tools.cwd(self.path):
             return self.tools.run("git clean -dfx", output_on_error=True)
 
-    @locked
     def reset(self):
         with self.tools.cwd(self.path):
             return self.tools.run("git reset --hard", output_on_error=True)
 
-    @locked
     def fetch(self, commit=None):
         if commit and not self.is_valid_sha(commit):
             commit = None
@@ -270,7 +260,6 @@ class GitRepository(object):
                 what=commit or refspec or '',
                 output_on_error=True)
 
-    @locked
     def checkout(self, rev, commit=None):
         if rev == self._last_rev:
             log.debug("Checkout skipped, already @ {}", rev)
@@ -566,6 +555,7 @@ class Git(WorkspaceResource, FileInfluence):
         influence = super()._influence()
         return influence + [self] if self._must_influence() else influence
 
+    @locked
     @utils.cached.instance
     def get_influence(self, task):
         if not self.git.is_cloned():

jolt-0.9.350/jolt/version.py

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

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

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

jolt-0.9.347/jolt/version.py

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