jolt 0.9.395__tar.gz → 0.9.414__tar.gz

{jolt-0.9.395 → jolt-0.9.414}/PKG-INFO

@@ -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 → jolt-0.9.414}/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-0.9.395 → jolt-0.9.414}/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-0.9.395 → jolt-0.9.414}/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-0.9.414/jolt/version.py

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

{jolt-0.9.395 → jolt-0.9.414}/jolt.egg-info/PKG-INFO

@@ -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.414/jolt.egg-info/requires.txt

@@ -0,0 +1,78 @@
+Jinja2==3.1.4
+Jinja2==3.1.4
+MarkupSafe==2.1.5
+PyJWT==2.9.0
+PyYAML==6.0.2
+Pygments==2.18.0
+SecretStorage==3.3.3
+allure-python-commons==2.13.5
+attrs==24.2.0
+backports.tarfile==1.2.0
+bottle==0.12.25
+bz2file==0.98
+certifi==2024.8.30
+cffi==1.17.1
+charset-normalizer==3.3.2
+click==8.1.7
+colorama==0.4.6
+conan==2.10.2
+cryptography==43.0.1
+distro==1.8.0
+docutils==0.21.2
+fasteners==0.19
+flake8==7.1.1
+grpcio==1.66.1
+idna==3.10
+importlib_metadata==8.5.0
+importlib_metadata==8.5.0
+jaraco.classes==3.4.0
+jaraco.context==6.0.1
+jaraco.functools==4.0.2
+jeepney==0.8.0
+keyring==25.4.1
+keyrings.alt==5.0.2
+lxml==5.3.0
+mccabe==0.7.0
+more-itertools==10.5.0
+more-itertools==10.5.0
+multi_key_dict==2.0.3
+nh3==0.2.19
+ninja==1.11.1.1
+packaging==24.2
+patch-ng==1.18.1
+pip==25.3
+pluggy==1.5.0
+pluginbase==1.0.1
+protobuf==5.28.2
+psutil==6.0.0
+pycodestyle==2.12.1
+pycparser==2.22
+pyflakes==3.2.0
+pygit2==1.15.1
+python-dateutil==2.9.0.post0
+readme_renderer==44.0
+requests==2.32.3
+setuptools==80.9.0
+six==1.16.0
+tqdm==4.66.5
+typing_extensions==4.12.2
+urllib3==1.26.20
+wheel==0.45.1
+zipp==3.20.2
+zstandard==0.23.0
+
+[allure]
+allure-python-commons
+
+[conan]
+conan>=2.0
+
+[dev]
+check-manifest
+
+[doc]
+sphinx-click
+sphinx-rtd-theme
+
+[test]
+coverage

jolt-0.9.395/jolt/version.py

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

jolt-0.9.395/jolt.egg-info/requires.txt

@@ -1,50 +0,0 @@
-MarkupSafe
-SecretStorage
-backports.tarfile==1.2.0
-bz2file==0.98
-certifi==2024.8.30
-cffi==1.17.1
-charset-normalizer==3.3.2
-click==8.1.7
-colorama==0.4.6
-fasteners==0.19
-grpcio==1.66.1
-idna==3.10
-importlib-metadata==8.5.0
-importlib_metadata
-jaraco.classes==3.4.0
-jaraco.context==6.0.1
-jaraco.functools==4.0.2
-jeepney==0.8.0
-jinja2==3.1.4
-keyring==25.4.1
-keyrings.alt==5.0.2
-lxml==5.3.0
-more-itertools==10.5.0
-multi_key_dict
-ninja==1.11.1.1
-protobuf==5.28.2
-psutil==6.0.0
-pycparser==2.22
-pygit2==1.15.1
-requests==2.32.3
-tqdm==4.66.5
-urllib3==1.26.20
-zipp==3.20.2
-zstandard==0.23.0
-
-[allure]
-allure-python-commons
-
-[conan]
-conan>=2.0
-
-[dev]
-check-manifest
-
-[doc]
-sphinx-click
-sphinx-rtd-theme
-
-[test]
-coverage