jolt 0.9.395__py3-none-any.whl → 0.9.414__py3-none-any.whl

jolt/plugins/git.py

@@ -111,7 +111,7 @@ class GitRepository(object):
 
                 utils.call_and_catch(self.tools.run, "git remote remove origin", output=False)
                 self.tools.run("git remote add origin {}", self.url, output_on_error=True)
-                self.tools.run("git fetch origin", output_on_error=True)
+                self._fetch_origin()
                 self.tools.run("git checkout -f FETCH_HEAD", output_on_error=True)
         else:
             if refpath and os.path.isdir(refpath):
@@ -124,6 +124,11 @@ class GitRepository(object):
             self.repository is None,
             "Failed to clone repository '{0}'", self.relpath)
 
+    @utils.retried.on_exception(JoltCommandError, pattern="Command failed: git fetch", count=6, backoff=[2, 5, 10, 15, 20, 30])
+    def _fetch_origin(self):
+        with self.tools.cwd(self.path):
+            self.tools.run("git fetch origin", output_on_error=True)
+
     @utils.cached.instance
     def diff_unchecked(self):
         if not self.is_indexed():
@@ -247,6 +252,7 @@ class GitRepository(object):
         with self.tools.cwd(self.path):
             return self.tools.run("git reset --hard", output_on_error=True)
 
+    @utils.retried.on_exception(JoltCommandError, pattern="Command failed: git fetch", count=6, backoff=[2, 5, 10, 15, 20, 30])
     def fetch(self, commit=None):
         if commit and not self.is_valid_sha(commit):
             commit = None
@@ -255,7 +261,7 @@ class GitRepository(object):
         with self.tools.cwd(self.path):
             log.info("Fetching {0} from {1}", commit or refspec or 'commits', self.url)
             self.tools.run(
-                "git fetch --prune {url} {what}",
+                "git fetch --force --prune {url} {what}",
                 url=self.url,
                 what=commit or refspec or '',
                 output_on_error=True)

jolt/plugins/selfdeploy.py

@@ -1,5 +1,5 @@
+import importlib_metadata
 import os
-import pkg_resources
 
 from jolt import config
 from jolt import filesystem as fs
@@ -100,21 +100,33 @@ class Jolt(Task):
 def get_dependencies(packages=None):
     reqs = packages or ["jolt"]
     pkgs = {}
+    skip = set()
 
     while reqs:
         req = reqs.pop()
 
-        dist = pkg_resources.working_set.by_key.get(req)
+        try:
+            dist = importlib_metadata.distribution(req)
+        except (ImportError, importlib_metadata.PackageNotFoundError):
+            dist = None
+        except Exception:
+            dist = None
         if dist is None:
-            log.debug("[SelfDeploy] Dependency not found: {}", req)
-            pkgs[req] = req
+            skip.add(req)
             continue
 
-        for dep in dist.requires():
-            if dep.name not in pkgs:
-                reqs.append(dep.name)
-
-        pkgs[req] = f"{dist.project_name}=={dist.version}"
+        for dep in dist.requires or []:
+            dep = dep.split(" ", 1)[0].strip()
+            dep = dep.split("[", 1)[0].strip()
+            dep = dep.split(";", 1)[0].strip()
+            dep = dep.split(">", 1)[0].strip()
+            dep = dep.split("=", 1)[0].strip()
+            dep = dep.split("<", 1)[0].strip()
+            dep = dep.split("!", 1)[0].strip()
+            if dep not in pkgs and dep not in skip:
+                reqs.append(dep)
+
+        pkgs[req] = f"{dist.name}=={dist.version}"
 
     try:
         del pkgs["jolt"]

jolt/tasks.py

@@ -10,6 +10,7 @@ import platform
 from threading import RLock
 import subprocess
 from os import environ
+from os import sys as os_sys
 import sys
 import unittest as ut
 from urllib.parse import urlparse
@@ -3134,7 +3135,8 @@ class Script(Task):
         doc = self.__doc__.split("---", 1)
         script = doc[1] if len(doc) > 1 else doc[0]
         script = script.splitlines()
-        script = [line[4:] for line in script]
+        if os_sys.version_info < (3, 13):
+            script = [line[4:] for line in script]
         script = "\n".join(script)
         script = script.lstrip()
         if not script.startswith("#!"):

jolt/version.py

@@ -1 +1 @@
-__version__ = "0.9.395"
+__version__ = "0.9.414"

{jolt-0.9.395.dist-info → jolt-0.9.414.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.395
+Version: 0.9.414
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson
@@ -21,38 +21,66 @@ Classifier: Programming Language :: Java
 Classifier: Programming Language :: JavaScript
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
-Requires-Dist: MarkupSafe
-Requires-Dist: SecretStorage
+Requires-Dist: Jinja2==3.1.4
+Requires-Dist: Jinja2==3.1.4
+Requires-Dist: MarkupSafe==2.1.5
+Requires-Dist: PyJWT==2.9.0
+Requires-Dist: PyYAML==6.0.2
+Requires-Dist: Pygments==2.18.0
+Requires-Dist: SecretStorage==3.3.3
+Requires-Dist: allure-python-commons==2.13.5
+Requires-Dist: attrs==24.2.0
 Requires-Dist: backports.tarfile==1.2.0
+Requires-Dist: bottle==0.12.25
 Requires-Dist: bz2file==0.98
 Requires-Dist: certifi==2024.8.30
 Requires-Dist: cffi==1.17.1
 Requires-Dist: charset-normalizer==3.3.2
 Requires-Dist: click==8.1.7
 Requires-Dist: colorama==0.4.6
+Requires-Dist: conan==2.10.2
+Requires-Dist: cryptography==43.0.1
+Requires-Dist: distro==1.8.0
+Requires-Dist: docutils==0.21.2
 Requires-Dist: fasteners==0.19
+Requires-Dist: flake8==7.1.1
 Requires-Dist: grpcio==1.66.1
 Requires-Dist: idna==3.10
-Requires-Dist: importlib-metadata==8.5.0
-Requires-Dist: importlib_metadata
+Requires-Dist: importlib_metadata==8.5.0
+Requires-Dist: importlib_metadata==8.5.0
 Requires-Dist: jaraco.classes==3.4.0
 Requires-Dist: jaraco.context==6.0.1
 Requires-Dist: jaraco.functools==4.0.2
 Requires-Dist: jeepney==0.8.0
-Requires-Dist: jinja2==3.1.4
 Requires-Dist: keyring==25.4.1
 Requires-Dist: keyrings.alt==5.0.2
 Requires-Dist: lxml==5.3.0
+Requires-Dist: mccabe==0.7.0
 Requires-Dist: more-itertools==10.5.0
-Requires-Dist: multi_key_dict
+Requires-Dist: more-itertools==10.5.0
+Requires-Dist: multi_key_dict==2.0.3
+Requires-Dist: nh3==0.2.19
 Requires-Dist: ninja==1.11.1.1
+Requires-Dist: packaging==24.2
+Requires-Dist: patch-ng==1.18.1
+Requires-Dist: pip==25.3
+Requires-Dist: pluggy==1.5.0
+Requires-Dist: pluginbase==1.0.1
 Requires-Dist: protobuf==5.28.2
 Requires-Dist: psutil==6.0.0
+Requires-Dist: pycodestyle==2.12.1
 Requires-Dist: pycparser==2.22
+Requires-Dist: pyflakes==3.2.0
 Requires-Dist: pygit2==1.15.1
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: readme_renderer==44.0
 Requires-Dist: requests==2.32.3
+Requires-Dist: setuptools==80.9.0
+Requires-Dist: six==1.16.0
 Requires-Dist: tqdm==4.66.5
+Requires-Dist: typing_extensions==4.12.2
 Requires-Dist: urllib3==1.26.20
+Requires-Dist: wheel==0.45.1
 Requires-Dist: zipp==3.20.2
 Requires-Dist: zstandard==0.23.0
 Provides-Extra: allure

{jolt-0.9.395.dist-info → jolt-0.9.414.dist-info}/RECORD

@@ -19,11 +19,11 @@ jolt/log.py,sha256=cqEfX__AWSA4onueTTdoL4HnovEtzT4yoRoyKQk2MH8,14592
 jolt/manifest.py,sha256=V5fkvTE-cZt0IQbA8sBdC4WEaYrz7FEXQdSt6Uj-DWc,7256
 jolt/options.py,sha256=BrsyKsj3sY5qogMreHGgbimQuyGjnyilCa8QXPVm1Y0,947
 jolt/scheduler.py,sha256=2xehPvoJDLdv211UdP2cqqQs2M2L5Ozw2_GuE556Tjg,32513
-jolt/tasks.py,sha256=fD-huf0h0xN5x3MjClaZMRDPuhjwHeF3SBnqXXlHjtM,115888
+jolt/tasks.py,sha256=45UcZYaXV2-KQZHTsA4_TCiY1G8Bvpf6M7K2_R6ELJo,115963
 jolt/timer.py,sha256=PE-7vmsqZpF73e_cKSsrhd36-A7fJ9_XGYI_oBWJn5w,644
 jolt/tools.py,sha256=A9mbyZkp4NH9Xkroz5KKhsvn8jIqnvnogVaI4VbgM20,80171
 jolt/utils.py,sha256=bbp5mMhQRdq7sHDAxaqVVgD4QGGWXcwMCyIgG8LvyoA,19133
-jolt/version.py,sha256=iL8LBuTPisUZhLTYDKVadH6mpJf0bAZWS8ZdechzVOM,24
+jolt/version.py,sha256=ULqTpfbLz-5Z_aP6GcjaiAJnQO__jRJkmSUyiuS_zKk,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
@@ -47,7 +47,7 @@ jolt/plugins/email.xslt,sha256=3vrrfnG-KH_cfJq6RDOXHKQxKd-6s28qy4znapGaciM,8513
 jolt/plugins/environ.py,sha256=k382rvEKWj-nlibJcCUWcYtYheU8p9df9ZY0DAAkjDE,3561
 jolt/plugins/gdb.py,sha256=gg-H_IQvRRPDZpk-djdIU7j3PO8CDINCSxWOemD2fA8,6288
 jolt/plugins/gerrit.py,sha256=tc8NeIDAg3mZJINU5aZg1fs3YsaVxM_MvkHa149aAIs,768
-jolt/plugins/git.py,sha256=AiPzYl0eqPcrd1bw8il42cUUrBLcCQIAG4f54wSVhyQ,21204
+jolt/plugins/git.py,sha256=PJhOp0uWKMylJoNqHGm7NRqIAU20kv9fc2ZnfvSTqjo,21571
 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
@@ -62,7 +62,7 @@ jolt/plugins/podman.py,sha256=7xrPWaJvSzsBSsEUaCwBfVtMfzx5pLUrZB7pxf8hLzs,22487
 jolt/plugins/python.py,sha256=kLx1Y3ezMH9AOW36DH_cNyDlvbIdTkyvPjwLYolnCEU,3073
 jolt/plugins/report.py,sha256=EiPuZSoxEM-fXDsHBQuRTf1xtvN_gPBodMej3E9CGx0,2695
 jolt/plugins/scheduler.py,sha256=SJdRb0taOF4zhKkPfc9zg8UyvDn7rJYtbyMPC93XXsk,24560
-jolt/plugins/selfdeploy.py,sha256=Mpjxr3O4xqHiBf1wN-fXRp0slfvbH1usSGcthaLO6_c,6508
+jolt/plugins/selfdeploy.py,sha256=oYeBefUfabf-ACEVbdyJi2n9SfAuXLK1Q12D35obZsw,6952
 jolt/plugins/strings.py,sha256=sHDroW0srlQI1aRwu_WANkmR35sUxPvZGO28CYo-ClY,1783
 jolt/plugins/symlinks.py,sha256=u4lTcpkepf0_mr_RI85uiSkI_WAUGebAOsbH5WlAnzo,2399
 jolt/plugins/telemetry.py,sha256=xHgJVbSVRaPy67kblL4wj86mDESlFS1z3NGDJ2uDXZ8,3572
@@ -85,8 +85,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.395.dist-info/METADATA,sha256=YSnsnUFCUPt9qPdhmrCQLe1-NoCKL-KdpnYe6wmqLRU,5763
-jolt-0.9.395.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jolt-0.9.395.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
-jolt-0.9.395.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
-jolt-0.9.395.dist-info/RECORD,,
+jolt-0.9.414.dist-info/METADATA,sha256=hf96S079kixNuNh4JBc26tYnga1mekWWuxJVDkAIneY,6691
+jolt-0.9.414.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jolt-0.9.414.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
+jolt-0.9.414.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
+jolt-0.9.414.dist-info/RECORD,,