jolt 0.9.439__tar.gz → 0.9.444__tar.gz

{jolt-0.9.439 → jolt-0.9.444}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.439
+Version: 0.9.444
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson
@@ -33,6 +33,7 @@ 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: blake3==1.0.8
 Requires-Dist: bottle==0.12.25
 Requires-Dist: brotli==1.2.0
 Requires-Dist: bz2file==0.98

{jolt-0.9.439 → jolt-0.9.444}/jolt/graph.py

@@ -139,9 +139,9 @@ class TaskProxy(object):
             if c.is_workspace_resource():
                 c.task.acquire_ws()
 
-        sha = hashlib.sha1()
-        HashInfluenceRegistry.get().apply_all(self.task, sha)
-        self.task.identity = sha.hexdigest()
+        hash = utils.hashfn()
+        HashInfluenceRegistry.get().apply_all(self.task, hash)
+        self.task.identity = hash.hexdigest()
 
         return str(self.task.identity)
 

{jolt-0.9.439 → jolt-0.9.444}/jolt/influence.py

@@ -1,5 +1,4 @@
 import datetime
-import hashlib
 import os
 from pathlib import Path, PurePath
 
@@ -158,17 +157,17 @@ class TaskSourceInfluence(HashInfluenceProvider):
         else:
             funcs = []
 
-        # Calculate sha1 sum for all functions
-        shasum = hashlib.sha1()
+        # Calculate hash sum for all functions
+        sum = ""
         for func in funcs:
             try:
                 func.__influence
             except AttributeError:
-                func.__influence = utils.sha1(inspection.getfuncsource(func))
+                func.__influence = utils.hashstring(inspection.getfuncsource(func))
             finally:
-                shasum.update(func.__influence.encode())
+                sum += func.__influence
 
-        return shasum.hexdigest() + ": " + funcname
+        return utils.hashstring(sum) + ": " + funcname
 
 
 def source(name, obj=None):
@@ -271,7 +270,7 @@ class TaskClassSourceInfluence(HashInfluenceProvider):
     name = "Source"
 
     def get_influence(self, task):
-        # Calculate sha1 sum for classes in hierarchy
+        # Calculate hash sum for classes in hierarchy
         result = ""
         for cls in reversed(task.__class__.mro()):
             if cls is object:
@@ -280,7 +279,7 @@ class TaskClassSourceInfluence(HashInfluenceProvider):
                 cls.__dict__["_TaskClassSourceInfluence__influence"]
             except KeyError:
                 try:
-                    cls.__influence = utils.sha1(inspection.getclasssource(cls))
+                    cls.__influence = utils.hashstring(inspection.getclasssource(cls))
                 except TypeError:
                     continue
             result += cls.__dict__["_TaskClassSourceInfluence__influence"] + \
@@ -529,7 +528,7 @@ class FileInfluence(HashInfluenceProvider):
         self._files = {}
 
     def get_file_influence(self, path):
-        return utils.filesha1(str(path))
+        return utils.hashfile(str(path))
 
     def get_filelist(self, task):
         try:

{jolt-0.9.439 → jolt-0.9.444}/jolt/loader.py

@@ -462,7 +462,7 @@ def export_workspace(tasks=None) -> common_pb.Workspace:
         with tools.cwd(loader.workspace_path):
             cwd = tools.getcwd()
             cachedir = config.get_cachedir()
-            indexhash = utils.sha1(cwd)
+            indexhash = utils.hashstring(cwd)
             indexfile = tools.expand_path(
                 "{cachedir}/indexes/{}/{}",
                 indexhash[:2], indexhash[2:],

jolt-0.9.444/jolt/pkgs/blake3.py

@@ -0,0 +1,15 @@
+from jolt import attributes, Parameter
+from jolt.plugins import cmake, git
+from jolt.tasks import TaskRegistry
+
+
+@attributes.requires("requires_git")
+@cmake.requires()
+class Blake3(cmake.CMake):
+    name = "blake3"
+    version = Parameter("1.8.3", help="blake3 version.")
+    requires_git = ["git:url=https://github.com/BLAKE3-team/BLAKE3.git,rev={version}"]
+    srcdir = "{git[BLAKE3]}/c"
+
+
+TaskRegistry.get().add_task_class(Blake3)

jolt-0.9.444/jolt/pkgs/brotli.py

@@ -0,0 +1,20 @@
+from jolt import attributes, BooleanParameter, Parameter
+from jolt.plugins import git, cmake
+from jolt.tasks import TaskRegistry
+
+
+@attributes.requires("requires_git")
+@cmake.requires()
+@cmake.use_ninja()
+class Brotli(cmake.CMake):
+    name = "brotli"
+    version = Parameter("1.2.0", help="Brotli version.")
+    shared = BooleanParameter(False, help="Build shared libraries.")
+    requires_git = ["git:url=https://github.com/google/brotli.git,rev=v{version},submodules=true"]
+    srcdir = "{git[brotli]}"
+    options = [
+        "BUILD_SHARED_LIBS={shared[ON,OFF]}",
+    ]
+
+
+TaskRegistry.get().add_task_class(Brotli)

{jolt-0.9.439 → jolt-0.9.444}/jolt/pkgs/curl.py

@@ -1,11 +1,14 @@
 from jolt import attributes, BooleanParameter, Parameter
-from jolt.pkgs import cmake, ssl
+from jolt.pkgs import brotli, ssl, zlib, zstd
 from jolt.plugins import git, cmake
 from jolt.tasks import TaskRegistry
 
 
+@attributes.requires("requires_brotli")
 @attributes.requires("requires_git")
 @attributes.requires("requires_ssl")
+@attributes.requires("requires_zlib")
+@attributes.requires("requires_zstd")
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
@@ -13,12 +16,16 @@ class Curl(cmake.CMake):
     name = "curl"
     version = Parameter("8.17.0", help="Curl version.")
     shared = BooleanParameter(False, help="Build shared libraries.")
+    requires_brotli = ["brotli"]
     requires_git = ["git:url=https://github.com/curl/curl.git,rev=curl-{_version_tag},submodules=true"]
     requires_ssl = ["virtual/ssl"]
+    requires_zlib = ["virtual/zlib"]
+    requires_zstd = ["zstd"]
     srcdir = "{git[curl]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
         "CURL_USE_LIBPSL=OFF",
+        "USE_LIBIDN2=OFF",
     ]
 
     @property

{jolt-0.9.439 → jolt-0.9.444}/jolt/pkgs/grpc.py

@@ -56,8 +56,6 @@ class GrpcC(Task):
     extends = "grpc"
 
     def publish(self, artifact, tools):
-        if self.system == "windows":
-            artifact.cxxinfo.msvcrt = "Dynamic"
         artifact.cxxinfo.libraries.append("grpc")
 
 
@@ -66,8 +64,6 @@ class GrpcCXX(Task):
     extends = "grpc"
 
     def publish(self, artifact, tools):
-        if self.system == "windows":
-            artifact.cxxinfo.msvcrt = "Dynamic"
         artifact.cxxinfo.libraries.append("grpc++")
 
 

{jolt-0.9.439 → jolt-0.9.444}/jolt/pkgs/poco.py

@@ -7,6 +7,7 @@ import os
 
 @attributes.requires("requires_git")
 @attributes.requires("requires_ssl")
+@attributes.system
 @cmake.requires()
 @cmake.use_ninja()
 class Poco(cmake.CMake):

{jolt-0.9.439 → jolt-0.9.444}/jolt/pkgs/protobuf.py

@@ -6,6 +6,7 @@ from jolt.tasks import TaskRegistry
 
 @attributes.requires("requires_abseil")
 @attributes.requires("requires_git")
+@attributes.system
 @cmake.requires()
 @cmake.use_ninja()
 class Protobuf(cmake.CMake):

{jolt-0.9.439 → jolt-0.9.444}/jolt/plugins/allure.py

@@ -40,7 +40,7 @@ class _ReporterTest(object):
 
     def attach(self, name, content, mime_type=None):
         with self._task.tools.cwd(self._outdirfull):
-            logpath = utils.sha1(content) + "-" + name
+            logpath = utils.hashstring(content) + "-" + name
             self._task.tools.write_file(logpath, content, expand=False)
             self._result.attachments.append(
                 Attachment(source=logpath, name=name, type=mime_type))
@@ -96,8 +96,8 @@ class Reporter(object):
             result.name = name
             result.start = time.time() * 1000
             result.fullName = self._task.__class__.__name__ + "." + name
-            result.testCaseId = utils.sha1(result.fullName)
-            result.historyId = utils.sha1(self._task.qualified_name + result.testCaseId)
+            result.testCaseId = utils.hashstring(result.fullName)
+            result.historyId = utils.hashstring(self._task.qualified_name + result.testCaseId)
             result.description = description
             result.labels.append(Label(name=LabelType.HOST, value=self._host))
             result.labels.append(Label(name=LabelType.THREAD, value=self._thread))
@@ -202,8 +202,8 @@ class AllureHooks(TaskHook):
             result.start = time.time() * 1000
             result.fullName = task.qualified_name
             result.description = task.task.__doc__
-            result.testCaseId = utils.sha1(result.fullName)
-            result.historyId = utils.sha1(task.qualified_name + result.testCaseId)
+            result.testCaseId = utils.hashstring(result.fullName)
+            result.historyId = utils.hashstring(task.qualified_name + result.testCaseId)
             result.labels.append(Label(name=LabelType.HOST, value=host_tag()))
             result.labels.append(Label(name=LabelType.THREAD, value=thread_tag()))
             result.labels.append(Label(name=LabelType.FRAMEWORK, value='jolt'))
@@ -217,7 +217,7 @@ class AllureHooks(TaskHook):
             with task.tools.cwd(self._logpath):
                 content = task.allure_logsink_buffer.getvalue()
                 if content:
-                    logpath = utils.sha1(content) + "-" + "log"
+                    logpath = utils.hashstring(content) + "-" + "log"
                     task.tools.write_file(logpath, content, expand=False)
                     result.attachments.append(
                         Attachment(source=logpath, name="log", type="text/plain"))

{jolt-0.9.439 → jolt-0.9.444}/jolt/plugins/ninja.py

@@ -1281,7 +1281,7 @@ class FileListWriter(Rule):
 
     def _data(self, project, files):
         data = "\n".join(files)
-        return data, utils.sha1(data)
+        return data, utils.hashstring(data)
 
     def build(self, project, writer, infiles, implicit=None, order_only=None):
         infiles = [fs.as_posix(infile) for infile in infiles] if self.posix else infiles
@@ -1320,7 +1320,7 @@ class GNUMRIWriter(FileListWriter):
             else:
                 data += "addmod {}\n".format(infile)
         data += "save\nend\n"
-        return data, utils.sha1(data)
+        return data, utils.hashstring(data)
 
     @utils.cached.instance
     def get_influence(self, task):

{jolt-0.9.439 → jolt-0.9.444}/jolt/tasks.py

@@ -1977,26 +1977,26 @@ class SubTask(object):
 
     @functools.cached_property
     def identity(self):
-        sha = hashlib.sha1()
+        hash = utils.hashfn()
         for ident in self._identity:
-            sha.update(ident.encode())
+            hash.update(ident.encode())
         for output in self._outputs:
-            sha.update(output.encode())
+            hash.update(output.encode())
         if self.message:
-            sha.update(self.message.encode())
-        return sha.hexdigest()
+            hash.update(self.message.encode())
+        return hash.hexdigest()
 
     @functools.cached_property
     def influence(self):
-        sha = hashlib.sha1()
+        hash = utils.hashfn()
         for infl in self._influence:
             if callable(infl):
-                sha.update(infl().encode())
+                hash.update(infl().encode())
             else:
-                sha.update(infl.encode())
+                hash.update(infl.encode())
         for dep in self._deps:
-            sha.update(dep.influence.encode())
-        return sha.hexdigest()
+            hash.update(dep.influence.encode())
+        return hash.hexdigest()
 
     @functools.cached_property
     def is_outdated(self):
@@ -2049,7 +2049,7 @@ class SubTask(object):
 
     def add_influence_file(self, path):
         path = self._tools.expand_path(path)
-        self.add_influence(utils.filesha1(path))
+        self.add_influence(utils.hashfile(path))
 
     def add_influence_depfile(self, path):
         def depfile():
@@ -2062,7 +2062,7 @@ class SubTask(object):
                 for output in self.outputs:
                     for input in deps.get(output, []):
                         input = self._tools.expand_path(input)
-                        result += utils.filesha1(input)
+                        result += utils.hashfile(input)
             return result
         self.add_influence(depfile)
 

{jolt-0.9.439 → jolt-0.9.444}/jolt/tools.py

@@ -1,10 +1,12 @@
 import py7zr
+import blake3
 import bz2
 import copy
 import getpass
 import gzip
 import json
 import lzma
+import mmap
 import subprocess
 import os
 import platform
@@ -710,7 +712,7 @@ class Tools(object):
         from jolt.loader import JoltLoader
         return fs.path.normpath(JoltLoader.get().build_path)
 
-    def checksum_file(self, filelist, concat=False, hashfn=hashlib.sha1, filterfn=None):
+    def checksum_file(self, filelist, concat=False, hashfn=blake3.blake3):
         """ Calculate a checksum of one or multiple files.
 
         Args:
@@ -718,24 +720,27 @@ class Tools(object):
             concat (boolean): Concatenate files and return a single digest. If False,
                 a list with one digest for each file is returned. Default: False.
             hashfn: The hash algorithm used. Any type which provides an update() and
-                hexdigest() method is accepted. Default: hashlib.sha1
-            filterfn: An optional data filter function. It is called repeatedly
-                with each block of data read from files as its only argument.
-                It should return the data to be included in the checksum.
-                Default: None
+                hexdigest() method is accepted. Default: blake3
 
         Returns:
             A list of checksum digests, or a single digest if files where concatenated.
         """
         files = [self.expand_path(fname) for fname in utils.as_list(filelist)]
-        filterfn = filterfn or (lambda data: data)
         result = []
-        checksum = hashfn()
 
         for fname in files:
+            checksum = hashfn()
             with open(fname, "rb") as f:
-                for block in iter(lambda: f.read(0x10000), b''):
-                    checksum.update(bytes(filterfn(block)))
+                mm = None
+                try:
+                    mm = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+                    checksum.update(mm)
+                except ValueError:
+                    # File is empty
+                    pass
+                finally:
+                    if mm is not None:
+                        mm.close()
                 result.append(checksum.hexdigest())
             if not concat:
                 checksum = hashfn()

{jolt-0.9.439 → jolt-0.9.444}/jolt/utils.py

@@ -1,6 +1,8 @@
+import blake3
 import contextlib
 import ctypes
 import fnmatch
+import mmap
 import re
 import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
@@ -515,18 +517,30 @@ def map_concurrent(method, iterable, *args, **kwargs):
     return [future.result() for future in futures]
 
 
-def sha1(string):
-    sha = hashlib.sha1()
-    sha.update(string.encode())
-    return sha.hexdigest()
+def hashstring(string, hashfn=blake3.blake3):
+    hash = hashfn()
+    hash.update(string.encode())
+    return hash.hexdigest()
 
 
-def filesha1(path):
-    sha = hashlib.sha1()
+def hashfile(path, hashfn=blake3.blake3):
+    hash = hashfn()
     with open(path, "rb") as f:
-        for data in iter(lambda: f.read(0x10000), b''):
-            sha.update(data)
-    return sha.hexdigest()
+        mm = None
+        try:
+            mm = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+            hash.update(mm)
+        except ValueError:
+            # File is empty
+            pass
+        finally:
+            if mm is not None:
+                mm.close()
+    return hash.hexdigest()
+
+
+def hashfn(hashfn=blake3.blake3):
+    return hashfn()
 
 
 def fromjson(filepath, ignore_errors=False):

jolt-0.9.444/jolt/version.py

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

{jolt-0.9.439 → jolt-0.9.444}/jolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.439
+Version: 0.9.444
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson
@@ -33,6 +33,7 @@ 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: blake3==1.0.8
 Requires-Dist: bottle==0.12.25
 Requires-Dist: brotli==1.2.0
 Requires-Dist: bz2file==0.98

{jolt-0.9.439 → jolt-0.9.444}/jolt.egg-info/SOURCES.txt

@@ -42,8 +42,10 @@ jolt/pkgs/asio.py
 jolt/pkgs/autoconf.py
 jolt/pkgs/automake.py
 jolt/pkgs/b2.py
+jolt/pkgs/blake3.py
 jolt/pkgs/boost.py
 jolt/pkgs/boringssl.py
+jolt/pkgs/brotli.py
 jolt/pkgs/busybox.py
 jolt/pkgs/bzip2.py
 jolt/pkgs/cares.py

{jolt-0.9.439 → jolt-0.9.444}/jolt.egg-info/requires.txt

@@ -10,6 +10,7 @@ SecretStorage==3.3.3
 allure-python-commons==2.13.5
 attrs==24.2.0
 backports.tarfile==1.2.0
+blake3==1.0.8
 bottle==0.12.25
 brotli==1.2.0
 bz2file==0.98

{jolt-0.9.439 → jolt-0.9.444}/setup.py

@@ -70,6 +70,7 @@ setup(
     ],
     packages=find_packages(exclude=["contrib", "docs", "tests"]),
     install_requires=pinned_reqs or [
+        "blake3",
         "bz2file",
         "click>=8.1",
         "colorama",

jolt-0.9.439/jolt/version.py

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