jolt 0.9.347__py3-none-any.whl → 0.9.350__py3-none-any.whl

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/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/version.py

@@ -1 +1 @@
-__version__ = "0.9.347"
+__version__ = "0.9.350"

{jolt-0.9.347.dist-info → jolt-0.9.350.dist-info}/METADATA

@@ -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.dist-info → jolt-0.9.350.dist-info}/RECORD

@@ -10,7 +10,7 @@ jolt/config.py,sha256=2S8_bdcHaNzwDfkCkHNjFaWn9pykStA4rUa7pz3m5Sg,10367
 jolt/error.py,sha256=wbYU_ip3zGHlhmjQWjEeLlmLdTpiqIeFM5zJndVQdj4,2399
 jolt/expires.py,sha256=GDagfgJOlX_z2LLIFhKHBaXI96jo1S3ca2OGWQi1oj4,2330
 jolt/filesystem.py,sha256=BytxYk6Xq0peuRB9gUZ7EDsvbgirfp4EcjPANNDIstQ,5916
-jolt/graph.py,sha256=p5k2F_cy4DKziCeRRSG1mKOxtiZwJkF3FGs4RC5bRMg,44712
+jolt/graph.py,sha256=fpnpxi7DwTBk9Mh88iskOkptjpdjU1WFEsFmXnockXo,45698
 jolt/hooks.py,sha256=jcCaNwlyFrWkXrO6MiO_roDQVohefbablfXnuQ3dmmM,11029
 jolt/influence.py,sha256=c5Vdizk9kK-8O7cSU9LAHhh8xkvchudstBn7HLIr9hg,16937
 jolt/inspection.py,sha256=QkOCXAbjJBdw1SMsb6xH_3GHXV5BcdzaGD7HrGmOJss,3931
@@ -23,7 +23,7 @@ jolt/tasks.py,sha256=RYgkG_VB1CxJ_KPbNwPa-EWmqkES7uyvhqyFGtHDtQw,112809
 jolt/timer.py,sha256=PE-7vmsqZpF73e_cKSsrhd36-A7fJ9_XGYI_oBWJn5w,644
 jolt/tools.py,sha256=_ijnN47sDFaEDhPMPIkLKcqGOewk2MLzvvyp3kuoask,79867
 jolt/utils.py,sha256=6TphNzqr2AAQ55bGDD36YoJSi8qQM3FRkrY1iIkhtNA,18771
-jolt/version.py,sha256=InDFCQ4kNgrhUykHCPLb1lHkSAUhiPE9N85Gu2sFt8c,24
+jolt/version.py,sha256=lrUnx27u4yml1xuI2hCpgfAIoqn2zRxc_QY5KPnVTA0,24
 jolt/version_utils.py,sha256=tNCGT6ZmSGFHW1aw2Hx1l19m-RR1UnTN6xJV1I54KRw,3900
 jolt/xmldom.py,sha256=SbygiDUMYczzWGxXa60ZguWS6Nztg8gDAirdbtjT15I,5982
 jolt/bin/fstree-darwin-x86_64,sha256=i4Ppbdr7CxsEhJzWpy3GMB5Gn5ikmskh41MyUwQS3-o,29549000
@@ -48,7 +48,7 @@ jolt/plugins/email.xslt,sha256=3vrrfnG-KH_cfJq6RDOXHKQxKd-6s28qy4znapGaciM,8513
 jolt/plugins/environ.py,sha256=TKyajli6790VRMAVFKxKxUgdTR8Gg-4ftsgTd05cO74,3371
 jolt/plugins/gdb.py,sha256=EIsAGqMXKQ_EtdW_bsKXVU66J8JfUMFQjo-vzFHAADk,6151
 jolt/plugins/gerrit.py,sha256=tc8NeIDAg3mZJINU5aZg1fs3YsaVxM_MvkHa149aAIs,768
-jolt/plugins/git.py,sha256=QsZlKqA3n608fucQiDcSkkXeq_y4KDGPKXrWTx_O83E,21341
+jolt/plugins/git.py,sha256=AiPzYl0eqPcrd1bw8il42cUUrBLcCQIAG4f54wSVhyQ,21204
 jolt/plugins/golang.py,sha256=vV4iRoJpWkyfrBa96s6jgU8Sz8GnGl-lzG_FSj5epzQ,2049
 jolt/plugins/googletest.py,sha256=9aV_T21JY84YgeSiaV4ppZhVs1XFt19m3pPrJW2iGfI,18708
 jolt/plugins/http.py,sha256=HwuABHR2tuWm_jBdQpCO3AMkjFdwOzUfEi26X-2v_y8,3816
@@ -86,8 +86,8 @@ jolt/templates/cxxexecutable.cmake.template,sha256=f0dg1VOFlamlF8fuHFTki5dsJ2ssS
 jolt/templates/cxxlibrary.cmake.template,sha256=GMEG2G3QoY3E5fsNer52zOqgM221-abeCkV__mVbZ94,1750
 jolt/templates/export.sh.template,sha256=PKkflGXFbq70EIsowqcnLvzbnEDnqh_WgC4E_JNT0VE,1937
 jolt/templates/timeline.html.template,sha256=xdqvFBmhE8XRQaWgcIFBVbd__9HdRq6O-U0o276PyjU,1222
-jolt-0.9.347.dist-info/METADATA,sha256=H90TT6UsiF-06Eb0Toiedztg4B0gh7jRi1gU5BE-zd4,5557
-jolt-0.9.347.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-jolt-0.9.347.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
-jolt-0.9.347.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
-jolt-0.9.347.dist-info/RECORD,,
+jolt-0.9.350.dist-info/METADATA,sha256=qxGNCJtXk0C9KGspuOEPpTeCYtO_hx1wXaGjGcOtcHA,5557
+jolt-0.9.350.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+jolt-0.9.350.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
+jolt-0.9.350.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
+jolt-0.9.350.dist-info/RECORD,,