jolt 0.9.449__tar.gz → 0.9.456__tar.gz

{jolt-0.9.449 → jolt-0.9.456}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.449
+Version: 0.9.456
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

{jolt-0.9.449 → jolt-0.9.456}/jolt/config.py

@@ -1,4 +1,5 @@
 from configparser import ConfigParser, NoOptionError, NoSectionError
+from datetime import timedelta
 from urllib.parse import urlparse
 import os
 import re
@@ -152,6 +153,18 @@ def get(section, key, default=None, expand=True, alias=None):
     return utils.expand(val) if expand and val is not None else val
 
 
+def getduration(section, key, default=None, alias=None):
+    value = get(section, key, default=None, alias=alias)
+    if value is None:
+        if type(default) is timedelta:
+            return default
+        elif default is not None:
+            value = str(default)
+        else:
+            return None
+    return utils.parse_duration(value)
+
+
 def getint(section, key, default=None, alias=None):
     value = get(section, key, default=default, alias=alias)
     if value is not None:

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/abseil.py

@@ -13,6 +13,7 @@ class Abseil(cmake.CMake):
 
     name = "abseil"
     version = Parameter("20250814.1")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     shared = BooleanParameter(False, help="Build shared libraries")
     requires_git = ["git:url=https://github.com/abseil/abseil-cpp.git,rev={version}"]
     srcdir = "{git[abseil-cpp]}"
@@ -20,6 +21,7 @@ class Abseil(cmake.CMake):
         "ABSL_MSVC_STATIC_RUNTIME=OFF",
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
         "CMAKE_CXX_STANDARD=17",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
     ]
 
     def publish(self, artifact, tools):

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/blake3.py

@@ -1,4 +1,4 @@
-from jolt import attributes, Parameter
+from jolt import attributes, BooleanParameter, Parameter
 from jolt.plugins import cmake, git
 from jolt.tasks import TaskRegistry
 
@@ -8,8 +8,14 @@ from jolt.tasks import TaskRegistry
 class Blake3(cmake.CMake):
     name = "blake3"
     version = Parameter("1.8.3", help="blake3 version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
+    shared = BooleanParameter(False, help="Build shared libraries.")
     requires_git = ["git:url=https://github.com/BLAKE3-team/BLAKE3.git,rev={version}"]
     srcdir = "{git[BLAKE3]}/c"
+    options = [
+        "BUILD_SHARED_LIBS={shared[ON,OFF]}",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
+    ]
 
 
 TaskRegistry.get().add_task_class(Blake3)

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/brotli.py

@@ -9,11 +9,13 @@ from jolt.tasks import TaskRegistry
 class Brotli(cmake.CMake):
     name = "brotli"
     version = Parameter("1.2.0", help="Brotli version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     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]}",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
     ]
 
 

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/cares.py

@@ -11,6 +11,7 @@ from jolt.tasks import TaskRegistry
 class CAres(cmake.CMake):
     name = "c-ares"
     version = Parameter("1.34.6", help="c-ares version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     shared = BooleanParameter(False, help="Build shared libraries.")
     requires_git = ["git:url=https://github.com/c-ares/c-ares.git,rev=v{version}"]
     srcdir = "{git[c-ares]}"
@@ -18,6 +19,7 @@ class CAres(cmake.CMake):
         "CARES_SHARED={shared[ON,OFF]}",
         "CARES_STATIC={shared[OFF,ON]}",
         "CARES_BUILD_TESTS=OFF",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
     ]
 
 

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/curl.py

@@ -16,18 +16,20 @@ from jolt.tasks import TaskRegistry
 class Curl(cmake.CMake):
     name = "curl"
     version = Parameter("8.17.0", help="Curl version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     shared = BooleanParameter(False, help="Build shared libraries.")
-    requires_brotli = ["brotli"]
+    requires_brotli = ["brotli:pic={pic},shared={shared}"]
     requires_git = ["git:url=https://github.com/curl/curl.git,rev=curl-{_version_tag},submodules=true"]
-    requires_ssl = ["virtual/ssl:shared={shared}"]
-    requires_zlib = ["virtual/zlib"]
-    requires_zstd = ["zstd"]
+    requires_ssl = ["virtual/ssl:pic={pic},shared={shared}"]
+    requires_zlib = ["virtual/zlib:pic={pic},shared={shared}"]
+    requires_zstd = ["zstd:pic={pic},shared={shared}"]
     srcdir = "{git[curl]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
         "CURL_USE_LIBPSL=OFF",
         "USE_LIBIDN2=OFF",
         "OPENSSL_USE_STATIC_LIBS={shared[OFF,ON]}",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
     ]
 
     @property

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/grpc.py

@@ -19,19 +19,21 @@ from jolt.tasks import TaskRegistry
 class Grpc(cmake.CMake):
     name = "grpc"
     version = Parameter("1.76.0", help="Grpc version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     shared = BooleanParameter(False, help="Build shared libraries.")
     generator = "Ninja"
-    requires_abseil = ["abseil:shared={shared}"]
-    requires_cares = ["c-ares:shared={shared}"]
+    requires_abseil = ["abseil:pic={pic},shared={shared}"]
+    requires_cares = ["c-ares:pic={pic},shared={shared}"]
     requires_git = ["git:url=https://github.com/grpc/grpc.git,path={buildroot}/git_grpc,rev=v{version},submodules=true"]
     requires_nasm_windows = ["nasm"]
-    requires_protobuf = ["protobuf:shared={shared}"]
-    requires_re2 = ["re2:shared={shared}"]
-    requires_ssl = ["virtual/ssl:shared={shared}"]
-    requires_zlib = ["zlib"]
+    requires_protobuf = ["protobuf:pic={pic},shared={shared}"]
+    requires_re2 = ["re2:pic={pic},shared={shared}"]
+    requires_ssl = ["virtual/ssl:pic={pic},shared={shared}"]
+    requires_zlib = ["virtual/zlib:pic={pic},shared={shared}"]
     srcdir = "{git[grpc]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
         "CMAKE_CXX_STANDARD=17",
         "gRPC_ABSL_PROVIDER=package",
         "gRPC_BUILD_TESTS=OFF",

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/protobuf.py

@@ -19,13 +19,15 @@ class Protobuf(cmake.CMake):
 
     name = "protobuf"
     version = Parameter("33.2", help="Protobuf version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     shared = BooleanParameter(False, help="Build shared libraries")
-    requires_abseil = ["abseil:shared={shared}"]
+    requires_abseil = ["abseil:pic={pic},shared={shared}"]
     requires_git = ["git:url=https://github.com/protocolbuffers/protobuf.git,rev=v{version}"]
     srcdir = "{git[protobuf]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
         "CMAKE_CXX_STANDARD=17",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
         "protobuf_BUILD_TESTS=OFF",
         "protobuf_MSVC_STATIC_RUNTIME=OFF",
     ]

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/re2.py

@@ -12,12 +12,14 @@ from jolt.tasks import TaskRegistry
 class RE2(cmake.CMake):
     name = "re2"
     version = Parameter("2025-11-05", help="re2 version.")
+    pic = BooleanParameter(False, help="Build with position independent code.")
     shared = BooleanParameter(False, help="Build shared libraries.")
     requires_abseil = ["abseil:shared={shared}"]
     requires_git = ["git:url=https://github.com/google/re2.git,rev={version}"]
     srcdir = "{git[re2]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
         "RE2_BUILD_TESTING=OFF",
     ]
 

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/ssl.py

@@ -5,6 +5,7 @@ from jolt.tasks import TaskRegistry
 
 class VirtualSsl(Alias):
     name = "virtual/ssl"
+    pic = BooleanParameter(False, "Build with position independent code.")
     shared = BooleanParameter(False, help="Use shared libraries.")
     requires = ["openssl:shared={shared}"]
 

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/zlib.py

@@ -12,11 +12,13 @@ from jolt.tasks import TaskRegistry
 class Zlib(cmake.CMake):
     name = "zlib"
     version = Parameter("1.3.1", help="Zlib version.")
+    pic = BooleanParameter(False, "Build with position independent code.")
     shared = BooleanParameter(False, "Enable shared libraries.")
     requires_git = ["git:clean=true,url=https://github.com/madler/zlib.git,rev=v{version}"]
     srcdir = "{git[zlib]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
         "ZLIB_BUILD_EXAMPLES=OFF",
     ]
 
@@ -58,12 +60,14 @@ class Zlib(cmake.CMake):
 class ZlibNg(cmake.CMake):
     name = "zlib-ng"
     version = Parameter("2.3.2", help="Zlib version.")
+    pic = BooleanParameter(False, "Build with position independent code.")
     shared = BooleanParameter(False, "Enable shared libraries.")
     requires_git = ["git:url=https://github.com/zlib-ng/zlib-ng.git,rev={version}"]
     srcdir = "{git[zlib-ng]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
         "BUILD_TESTING=OFF",
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
     ]
 
     def publish(self, artifact, tools):
@@ -77,7 +81,9 @@ class ZlibNg(cmake.CMake):
 
 class VirtualZlib(Alias):
     name = "virtual/zlib"
-    requires = ["zlib"]
+    pic = BooleanParameter(False, "Build with position independent code.")
+    shared = BooleanParameter(False, "Enable shared libraries.")
+    requires = ["zlib:pic={pic},shared={shared}"]
 
 
 TaskRegistry.get().add_task_class(Zlib)

{jolt-0.9.449 → jolt-0.9.456}/jolt/pkgs/zstd.py

@@ -12,10 +12,12 @@ from jolt.tasks import TaskRegistry
 class Zstd(cmake.CMake):
     name = "zstd"
     version = Parameter("ebc93b0", help="zstd version.")
+    pic = BooleanParameter(False, "Build with position independent code.")
     shared = BooleanParameter(False, "Enable shared libraries.")
     requires_git = ["git:url=https://github.com/facebook/zstd.git,rev={version}"]
     srcdir = "{git[zstd]}"
     options = [
+        "CMAKE_POSITION_INDEPENDENT_CODE={pic[ON,OFF]}",
         "ZSTD_BUILD_SHARED={shared[ON,OFF]}",
         "ZSTD_BUILD_STATIC={shared[OFF,ON]}",
         "ZSTD_BUILD_TESTS=OFF",

{jolt-0.9.449 → jolt-0.9.456}/jolt/plugins/cache.py

@@ -20,7 +20,7 @@ class Cache(cache.StorageProvider):
     def __init__(self, cache):
         super().__init__()
         self._cache = cache
-        self._uri = config.get(NAME, "uri", "http://cache")
+        self._uri = config.get(NAME, "http_uri", config.get(NAME, "uri", "http://cache"))
         self._uri = self._uri.rstrip("/")
         raise_error_if(not self._uri, "Cache Service URI not configured")
         self._file_uri = self._uri + "/files"

{jolt-0.9.449 → jolt-0.9.456}/jolt/plugins/scheduler.py

@@ -33,6 +33,18 @@ NAME = "scheduler"
 TYPE = "Remote execution"
 
 
+grpc_keepalive_opts = []
+grpc_keepalive_time = config.getduration(NAME, "grpc_keepalive_time")
+grpc_keepalive_timeout = config.getduration(NAME, "grpc_keepalive_timeout")
+grpc_keepalive_without_calls = config.getboolean(NAME, "grpc_keepalive_without_calls", False)
+if grpc_keepalive_time is not None:
+    grpc_keepalive_opts.append(("grpc.keepalive_time_ms", int(grpc_keepalive_time.total_seconds() * 1000)))
+if grpc_keepalive_timeout is not None:
+    grpc_keepalive_opts.append(("grpc.keepalive_timeout_ms", int(grpc_keepalive_timeout.total_seconds() * 1000)))
+if grpc_keepalive_without_calls:
+    grpc_keepalive_opts.append(("grpc.keepalive_permit_without_calls", 1))
+
+
 def locked(func):
     """ Decorator to lock a method. """
     def _f(self, *args, **kwargs):
@@ -394,7 +406,7 @@ class RemoteSession(object):
         self.factory = factory
 
         # Address of the scheduler.
-        self.address = config.geturi(NAME, "uri", "tcp://scheduler.:9090")
+        self.address = config.geturi(NAME, "grpc_uri", config.geturi(NAME, "uri", "tcp://scheduler.:9090"))
         raise_error_if(self.address.scheme not in ["tcp"], "Invalid scheme in scheduler URI config: {}", self.address.scheme)
         raise_error_if(not self.address.netloc, "Invalid network address in scheduler URI config: {}", self.address.netloc)
 
@@ -404,6 +416,7 @@ class RemoteSession(object):
         # GRPC channel.
         self.channel = grpc.insecure_channel(
             target=self.address.netloc,
+            options=grpc_keepalive_opts,
         )
 
         # GRPC stub for the scheduler service.
@@ -559,11 +572,11 @@ log.verbose("[Remote] Loaded")
 @click.argument("request", required=True)
 @click.pass_context
 def executor(ctx, worker, build, request):
-    address = config.geturi(NAME, "uri", "tcp://scheduler.:9090")
+    address = config.geturi(NAME, "grpc_uri", "tcp://scheduler.:9090")
     raise_error_if(address.scheme not in ["tcp"], "Invalid scheme in scheduler URI config: {}", address.scheme)
     raise_error_if(not address.netloc, "Invalid network address in scheduler URI config: {}", address.netloc)
 
-    channel = grpc.insecure_channel(address.netloc)
+    channel = grpc.insecure_channel(address.netloc, options=grpc_keepalive_opts)
     log.verbose("Waiting for GRPC channel to connect")
     grpc.channel_ready_future(channel).result()
     log.verbose("GRPC channel established: {}", address.netloc)

{jolt-0.9.449 → jolt-0.9.456}/jolt/plugins/selfdeploy.py

@@ -159,7 +159,7 @@ def publish_artifact():
         executor.run(env)
     jolt_url = acache.location(task.artifacts[0])
     raise_error_if(not jolt_url, "Failed to deploy jolt to a remote cache")
-    cacheUrl = config.get("http", "uri", config.get("cache", "uri", "") + "/files")
+    cacheUrl = config.get("http", "uri", config.get("cache", "http_uri", config.get("cache", "uri", "")) + "/files")
     substituteUrl = config.get("selfdeploy", "baseUri")
     if cacheUrl and substituteUrl:
         return task.identity, jolt_url.replace(cacheUrl, substituteUrl)

{jolt-0.9.449 → jolt-0.9.456}/jolt/utils.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 import blake3
 import contextlib
 import ctypes
@@ -725,3 +726,40 @@ def platform_os_arch():
             f"Unsupported platform: {uname.system} {uname.machine}"
         ) from None
     return system, architecture
+
+
+def parse_duration(value: str) -> timedelta:
+    """ Parses a duration string into a timedelta object.
+
+    Supported formats are:
+    - Nms (milliseconds)
+    - Ns (seconds)
+    - Nm (minutes)
+    - Nh (hours)
+    - Nd (days)
+    - Nw (weeks)
+
+    Where N is an integer.
+    """
+    pattern = r"^(?P<value>\d+)(?P<unit>s|m|h|d|w)$"
+    match = re.match(pattern, value)
+    if not match:
+        raise ValueError(f"Invalid duration format: {value}")
+
+    value = int(match.group("value"))
+    unit = match.group("unit")
+
+    if unit == "ms":
+        return timedelta(milliseconds=value)
+    elif unit == "s":
+        return timedelta(seconds=value)
+    elif unit == "m":
+        return timedelta(minutes=value)
+    elif unit == "h":
+        return timedelta(hours=value)
+    elif unit == "d":
+        return timedelta(days=value)
+    elif unit == "w":
+        return timedelta(weeks=value)
+
+    raise ValueError(f"Unsupported duration unit: {unit}")

jolt-0.9.456/jolt/version.py

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

{jolt-0.9.449 → jolt-0.9.456}/jolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.449
+Version: 0.9.456
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

jolt-0.9.449/jolt/version.py

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