jolt 0.9.440__py3-none-any.whl → 0.9.445__py3-none-any.whl

jolt/pkgs/yamlcpp.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake, pkgconfig
+from jolt.plugins import cxxinfo, git, cmake, pkgconfig
 from jolt.tasks import TaskRegistry
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["yaml-cpp"])
 class YamlCPP(cmake.CMake):
     name = "yaml-cpp"
     version = Parameter("bbf8bdb", help="yaml-cpp version.")
@@ -20,11 +21,5 @@ class YamlCPP(cmake.CMake):
         "YAML_BUILD_TOOLS=OFF",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("yaml-cpp")
-
 
 TaskRegistry.get().add_task_class(YamlCPP)

jolt/pkgs/zeromq.py

@@ -1,12 +1,13 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import openssl
-from jolt.plugins import cmake, git
+from jolt.plugins import cmake, cxxinfo, git
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["zmq"])
 class Libzmq(cmake.CMake):
     name = "libzmq"
     version = Parameter("4.3.5", help="ZeroMQ version.")
@@ -19,17 +20,12 @@ class Libzmq(cmake.CMake):
         "CMAKE_POLICY_VERSION_MINIMUM=3.5",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("zmq")
-
 
 @attributes.requires("requires_git")
 @attributes.requires("requires_libzmq")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Cppzmq(cmake.CMake):
     name = "cppzmq"
     version = Parameter("4.11.0", help="cppzmq version.")
@@ -38,10 +34,6 @@ class Cppzmq(cmake.CMake):
     srcdir = "{git[cppzmq]}"
     options = ["CPPZMQ_BUILD_TESTS=OFF"]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-
 
 TaskRegistry.get().add_task_class(Libzmq)
 TaskRegistry.get().add_task_class(Cppzmq)

jolt/pkgs/zlib.py

@@ -1,6 +1,6 @@
 from jolt import attributes, Alias, BooleanParameter, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Zlib(cmake.CMake):
     name = "zlib"
     version = Parameter("1.3.1", help="Zlib version.")
@@ -22,8 +23,6 @@ class Zlib(cmake.CMake):
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
         artifact.environ.CMAKE_PREFIX_PATH.append(".")
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
         if self.system == "windows":
             self.publish_windows(artifact, tools)
         else:
@@ -31,23 +30,23 @@ class Zlib(cmake.CMake):
 
     def publish_unix(self, artifact, tools):
         artifact.cxxinfo.libraries.append("z")
-        with tools.cwd(artifact.path, "lib"):
+        with tools.cwd(artifact.path):
             if self.shared:
-                for lib in tools.glob("*.a"):
+                for lib in tools.glob("lib*/*.a"):
                     tools.unlink(lib)
             else:
-                for lib in tools.glob("*.so*") + tools.glob("*.dylib*"):
+                for lib in tools.glob("lib*/*.so*") + tools.glob("lib*/*.dylib*"):
                     tools.unlink(lib)
 
     def publish_windows(self, artifact, tools):
-        with tools.cwd(artifact.path, "lib"):
+        with tools.cwd(artifact.path):
             if self.shared:
                 artifact.cxxinfo.libraries.append("zlib")
-                for lib in tools.glob("zlibstatic.*"):
+                for lib in tools.glob("lib*/zlibstatic.*"):
                     tools.unlink(lib)
             else:
                 artifact.cxxinfo.libraries.append("zlibstatic")
-                for lib in tools.glob("zlib.*"):
+                for lib in tools.glob("lib*/zlib.*"):
                     tools.unlink(lib)
 
 
@@ -55,6 +54,7 @@ class Zlib(cmake.CMake):
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class ZlibNg(cmake.CMake):
     name = "zlib-ng"
     version = Parameter("2.3.2", help="Zlib version.")
@@ -69,8 +69,6 @@ class ZlibNg(cmake.CMake):
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
         artifact.environ.CMAKE_PREFIX_PATH.append(".")
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
         if self.system == "windows":
             artifact.cxxinfo.libraries.append("zlibstatic-ng")
         else:

jolt/pkgs/zstd.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Zstd(cmake.CMake):
     name = "zstd"
     version = Parameter("ebc93b0", help="zstd version.")
@@ -22,8 +23,6 @@ class Zstd(cmake.CMake):
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
         if self.system == "windows":
             artifact.cxxinfo.libraries.append("zstd_static")
         else:

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/plugins/cmake.py

@@ -1,4 +1,5 @@
-from jolt import attributes
+import functools
+from jolt import attributes, include
 from jolt import influence
 from jolt import Task
 from jolt import utils

jolt/plugins/cxxinfo.py

@@ -72,3 +72,35 @@ class CppInfoProvider(ArtifactAttributeSetProvider):
 
     def unapply(self, task, artifact):
         pass
+
+
+def publish(incpaths=["include"], libpaths=["lib", "lib32", "lib64"], libraries=[]):
+    """
+    Decorator to add C++ build information to a CMake task artifact.
+    """
+
+    import functools
+    import os
+
+    def decorate(cls):
+        old_publish = cls.publish
+
+        @functools.wraps(old_publish)
+        def new_publish(self, artifact, tools):
+            old_publish(self, artifact, tools)
+
+            for incpath in incpaths:
+                if os.path.isdir(os.path.join(artifact.path, incpath)):
+                    artifact.cxxinfo.incpaths.append(incpath)
+
+            for libpath in libpaths:
+                if os.path.isdir(os.path.join(artifact.path, libpath)):
+                    artifact.cxxinfo.libpaths.append(libpath)
+
+            for lib in libraries:
+                artifact.cxxinfo.libraries.append(lib)
+
+        cls.publish = new_publish
+        return cls
+
+    return decorate

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

@@ -1 +1 @@
-__version__ = "0.9.440"
+__version__ = "0.9.445"

{jolt-0.9.440.dist-info → jolt-0.9.445.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.440
+Version: 0.9.445
 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