jolt 0.9.373__py3-none-any.whl → 0.9.388__py3-none-any.whl

jolt/cache.py

@@ -1275,7 +1275,7 @@ class ArtifactCache(StorageProvider):
 
         # Read configuration
         self._max_size = config.getsize(
-            "jolt", "cachesize", os.environ.get("JOLT_CACHESIZE", 1 * 1024 ** 3))
+            "jolt", "cachesize", os.environ.get("JOLT_CACHE_SIZE", 1 * 1024 ** 3))
 
         # Create cache directory
         self._fs_create_cachedir()

jolt/cli.py

@@ -18,7 +18,7 @@ from jolt import log
 from jolt import __version__
 from jolt.log import logfile
 from jolt import config
-from jolt.loader import JoltLoader
+from jolt.loader import JoltLoader, import_workspace
 from jolt import tools
 from jolt import utils
 from jolt.influence import HashInfluenceRegistry
@@ -216,12 +216,13 @@ def _autocomplete_tasks(ctx, args, incomplete):
               help="Don't prune cached artifacts from the build graph. This option can be used to populate the local cache with remotely cached dependency artifacts.")
 @click.option("--worker", is_flag=True, default=False,
               help="Run with the worker build strategy", hidden=True)
+@click.option("--environ", type=click.Path(), help="Import build environment from protobuf", hidden=True)
 @click.pass_context
 @hooks.cli_build
 def build(ctx, task, network, keep_going, default, local,
           no_download, no_download_persistent, no_upload, download, upload, worker, force,
           salt, copy, debug, result, jobs, no_prune, verbose,
-          mute):
+          mute, environ):
     """
     Build task artifact.
 
@@ -253,6 +254,7 @@ def build(ctx, task, network, keep_going, default, local,
     are removed before execution starts.
 
     """
+
     raise_error_if(network and local,
                    "The -n and -l flags are mutually exclusive")
 
@@ -304,6 +306,33 @@ def build(ctx, task, network, keep_going, default, local,
     if keep_going:
         config.set_keep_going(True)
 
+    # Import build environment from protobuf if provided
+    buildenv = None
+    if environ:
+        with open(environ, "rb") as f:
+            from jolt import common_pb2 as common_pb
+            buildenv = common_pb.BuildEnvironment()
+            try:
+                buildenv.ParseFromString(f.read())
+            except Exception as e:
+                raise_error("Failed to parse build environment protobuf: {}", e)
+
+        # Import log level
+        log.set_level_pb(buildenv.loglevel)
+
+        # Import workspace
+        import_workspace(buildenv)
+
+        # Import configuration snippet
+        config.import_config(buildenv.config)
+
+        # Import configuration parameters (-c params.key)
+        config.import_params({param.key: param.value for param in buildenv.parameters})
+
+        # Import default parameters (-d taskname:param=value)
+        default = utils.as_list(default)
+        default += buildenv.task_default_parameters
+
     options = JoltOptions(
         network=network,
         local=local,
@@ -340,7 +369,7 @@ def build(ctx, task, network, keep_going, default, local,
 
     log.info("Started: {}", datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
 
-    gb = graph.GraphBuilder(registry, acache, options, progress=True)
+    gb = graph.GraphBuilder(registry, acache, options, progress=True, buildenv=buildenv)
     dag = gb.build(task)
 
     # If asked to force rebuild, taint all goal tasks

jolt/loader.py

@@ -252,6 +252,7 @@ class JoltLoader(object):
             for factory in _loaders:
                 loader = factory().create(searchpath)
                 for recipe in loader.recipes:
+                    recipe.workspace_path = os.path.relpath(recipe.path, self.workspace_path)
                     recipe.load()
                     self._recipes.append(recipe)
                     self._tasks += recipe.tasks
@@ -450,6 +451,7 @@ def export_workspace(tasks=None) -> common_pb.Workspace:
     cache_grpc_uri = config.geturi("cache", "grpc_uri")
     if fstree_enabled:
         if not cache_grpc_uri:
+            fstree_enabled = False
             log.warning("No cache gRPC URI configured, will not push workspace to remote cache")
         else:
             raise_error_if(cache_grpc_uri.scheme not in ["tcp"], "Invalid scheme in cache gRPC URI config: {}", cache_grpc_uri.scheme)
@@ -542,12 +544,13 @@ def export_workspace(tasks=None) -> common_pb.Workspace:
         tree=tree,
     )
 
-    for recipe in loader.recipes:
-        workspace.files.append(
-            common_pb.File(
-                path=recipe.basepath,
-                content=recipe.source,
+    if not fstree_enabled:
+        for recipe in loader.recipes:
+            workspace.files.append(
+                common_pb.File(
+                    path=recipe.workspace_path,
+                    content=recipe.source,
+                )
             )
-        )
 
     return workspace

jolt/plugins/docker.py

@@ -103,8 +103,8 @@ class DockerClient(Download):
     url = "https://download.docker.com/{host}/static/stable/{arch}/docker-{version}.tgz"
     """ URL of binaries """
 
-    version = Parameter("27.3.1", help="Docker version")
-    """ Docker version [27.3.1] """
+    version = Parameter("27.4.1", help="Docker version")
+    """ Docker version [27.4.1] """
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)

jolt/plugins/podman.py

@@ -1,4 +1,4 @@
-from jolt import Download, Parameter, Resource, Task
+from jolt import Parameter, Resource, Task
 from jolt.error import raise_task_error_if
 from jolt.tasks import TaskRegistry
 from jolt import attributes
@@ -15,7 +15,6 @@ from jolt.cache import ArtifactAttributeSetProvider
 import contextlib
 import json
 from os import path
-from platform import system
 import tarfile
 
 
@@ -100,35 +99,6 @@ class PodmanAttributeProvider(ArtifactAttributeSetProvider):
         artifact.podman.unapply(task, artifact)
 
 
-class PodmanClient(Download):
-    """ Task: Downloads and publishes the Podman command line client.
-
-    The task will be automatically made available after importing
-    ``jolt.plugins.podman``.
-    """
-
-    name = "podman/cli"
-    """ Name of the task """
-
-    arch = Parameter("x86_64", help="Host architecture")
-    """ Host architecture [x86_64] """
-
-    collect = ["podman/podman"]
-
-    host = Parameter(system().lower(), help="Host operating system")
-    """ Host operating system [autodetected] """
-
-    url = "https://download.podman.com/{host}/static/stable/{arch}/podman-{version}.tgz"
-    """ URL of binaries """
-
-    version = Parameter("20.10.13", help="Podman version")
-    """ Podman version [20.10.13] """
-
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.environ.PATH.append("podman")
-
-
 @attributes.requires("_image")
 class Container(Resource):
     """
@@ -344,8 +314,6 @@ class PodmanLogin(Resource):
     name = "podman/login"
     """ Name of the resource """
 
-    requires = ["podman/cli"]
-
     user = Parameter("", help="Podman Registry username")
     """
     Podman Registry username.
@@ -385,7 +353,6 @@ class PodmanLogin(Resource):
         tools.run("podman logout {server}")
 
 
-TaskRegistry.get().add_task_class(PodmanClient)
 TaskRegistry.get().add_task_class(PodmanLogin)
 
 
@@ -445,7 +412,6 @@ class ContainerImage(Task):
 
     Optionally add requirements to:
 
-      - ``podman/cli`` to provision the Podman client, if none is available on the host.
       - ``podman/login`` to automatically login to the Podman registry.
 
     This class must be subclassed.
@@ -468,7 +434,6 @@ class ContainerImage(Task):
         class Busybox(ContainerImage):
             \"\"\" Publishes Busybox image as gzip-compressed tarball \"\"\"
             compression = "gz"
-            requires = ["podman/cli"]
             tags = ["busybox:{identity}"]
 
     """

jolt/version.py

@@ -1 +1 @@
-__version__ = "0.9.373"
+__version__ = "0.9.388"

{jolt-0.9.373.dist-info → jolt-0.9.388.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: jolt
-Version: 0.9.373
+Version: 0.9.388
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson
@@ -66,6 +66,16 @@ Requires-Dist: sphinx-click; extra == "doc"
 Requires-Dist: sphinx-rtd-theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Jolt
 ============================

{jolt-0.9.373.dist-info → jolt-0.9.388.dist-info}/RECORD

@@ -1,8 +1,8 @@
 jolt/__init__.py,sha256=C1WNj-iUNT1gtK2v7zxlnyMLW9dsYcM_yzlltJEYY6Y,3267
 jolt/__main__.py,sha256=sAASLJ5dhK8jTKwh1vWAGQ2-qgLEgrAQlR-hIC75Ze0,1670
-jolt/cache.py,sha256=WwYkOhuSDF8M_cUjnij6Sj7rMUi6Lk6x2sg1iir9_hw,79401
+jolt/cache.py,sha256=rzacqo-Foq6yD3-k2aazxAQszYX2XK96sdPzegfV-og,79402
 jolt/chroot.py,sha256=lnejhnjO3takDBZewBOvVlN2e8GWKhXnjFlqQp_zAJ4,4666
-jolt/cli.py,sha256=SQUk1v0g4if1ZM-odlYWJquELMExZ3jVgxUXhton-GE,41867
+jolt/cli.py,sha256=b_jbDTaGnbxEdZvxhLH7TPTYjGyaMWVTdE3r6GU2G_k,42966
 jolt/colors.py,sha256=P6vhaILGoOn8odEwQ6-z871YQoTe3HRLgS6clavwVHs,737
 jolt/common_pb2.py,sha256=Oe9cyZ4qNyS2aTunjiO7tAO3XVw8XkZ1M7TaTmss3bs,6335
 jolt/common_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
@@ -14,7 +14,7 @@ jolt/graph.py,sha256=7OCfz_Q00tV1ewGUKjwKIhk6nbfd0KemprFTs3n3XTQ,45978
 jolt/hooks.py,sha256=jcCaNwlyFrWkXrO6MiO_roDQVohefbablfXnuQ3dmmM,11029
 jolt/influence.py,sha256=c5Vdizk9kK-8O7cSU9LAHhh8xkvchudstBn7HLIr9hg,16937
 jolt/inspection.py,sha256=QkOCXAbjJBdw1SMsb6xH_3GHXV5BcdzaGD7HrGmOJss,3931
-jolt/loader.py,sha256=F8JDCPjl4gdjs9X23iVb94iIqkasYTeEVaTjwfkmMH8,18962
+jolt/loader.py,sha256=-WpYcYDhdZBAncgtn9MPUMudOn2dr-nsWj9KEDKet-8,19152
 jolt/log.py,sha256=cqEfX__AWSA4onueTTdoL4HnovEtzT4yoRoyKQk2MH8,14592
 jolt/manifest.py,sha256=V5fkvTE-cZt0IQbA8sBdC4WEaYrz7FEXQdSt6Uj-DWc,7256
 jolt/options.py,sha256=BrsyKsj3sY5qogMreHGgbimQuyGjnyilCa8QXPVm1Y0,947
@@ -23,7 +23,7 @@ jolt/tasks.py,sha256=fD-huf0h0xN5x3MjClaZMRDPuhjwHeF3SBnqXXlHjtM,115888
 jolt/timer.py,sha256=PE-7vmsqZpF73e_cKSsrhd36-A7fJ9_XGYI_oBWJn5w,644
 jolt/tools.py,sha256=LpmBzeQCl--7y2wAbe1flufUfO7wDeP7v4tqzgbvdaI,80097
 jolt/utils.py,sha256=6TphNzqr2AAQ55bGDD36YoJSi8qQM3FRkrY1iIkhtNA,18771
-jolt/version.py,sha256=RYK5zO_o7KDGDj7bwALue6eJUFIyieMoDm0Mi08R0ko,24
+jolt/version.py,sha256=VDALzYR873jrSkhL4aSgbdpIzeADa7QF8BODCJQ4kuo,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
@@ -41,7 +41,7 @@ jolt/plugins/conan.py,sha256=5d7TdQBV1dcwTFfyW-U3jrfJDTpLbnp08Ltra1zTZyc,16259
 jolt/plugins/cxx.py,sha256=UqcBIcjCphRB2ojknU4v5vRv_6i3CmIAFZS1T3dXWVc,30487
 jolt/plugins/cxxinfo.py,sha256=yuHkgT2Lqg2v1GmrjINXBF--KeSOfMya7_HN8AA2hbw,2398
 jolt/plugins/dashboard.py,sha256=5XxU7J33htfc7rxPXTob37rOpehtWZh6N-HVlNHAluM,642
-jolt/plugins/docker.py,sha256=JYgwAHczci25JO0MeJ_E8G7t0ZcJQEvu87jYi9ZLJqw,21100
+jolt/plugins/docker.py,sha256=cVzX9EYsk0DSkSnkArwjhZ7iVfUTYOfLyMoO2uGvdhs,21100
 jolt/plugins/email.py,sha256=esONwpn7xKJLh4SYGZ0GpSZ2UwzWsckfsAPCeYdZSVw,3549
 jolt/plugins/email.xslt,sha256=3vrrfnG-KH_cfJq6RDOXHKQxKd-6s28qy4znapGaciM,8513
 jolt/plugins/environ.py,sha256=k382rvEKWj-nlibJcCUWcYtYheU8p9df9ZY0DAAkjDE,3561
@@ -58,7 +58,7 @@ jolt/plugins/ninja-compdb.py,sha256=Otxz-nQnJx-aAPuAf8-T0AOi_34ENHGb5gypGVVGFB0,
 jolt/plugins/ninja.py,sha256=7ToQS3Pl81R2qoSRvGvWlkITONjOwV2wRklrB64wURQ,102787
 jolt/plugins/nodejs.py,sha256=HHDbvmdlqnao3qOtpCD9UY7iyTIX4gb2WxKUBtn-3cM,1879
 jolt/plugins/paths.py,sha256=DgiPI5K5bV3lVuyNEMIjRO26iTwf6RL5-2WPQ3rSmj8,1920
-jolt/plugins/podman.py,sha256=w9dEY0sfR4tiE5MMd2K272JyrI8yN3UkDuUQkYK8SSI,23073
+jolt/plugins/podman.py,sha256=vxcR9-X4MtMLrejgwZCH80TAS7SujFVx5NeTXCHqoGk,21975
 jolt/plugins/python.py,sha256=kLx1Y3ezMH9AOW36DH_cNyDlvbIdTkyvPjwLYolnCEU,3073
 jolt/plugins/report.py,sha256=EiPuZSoxEM-fXDsHBQuRTf1xtvN_gPBodMej3E9CGx0,2695
 jolt/plugins/scheduler.py,sha256=SJdRb0taOF4zhKkPfc9zg8UyvDn7rJYtbyMPC93XXsk,24560
@@ -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.373.dist-info/METADATA,sha256=Dwyjtlg8IPfyv4-cn2zgtv-3NdQTb_AXm0R_wTeEcT0,5558
-jolt-0.9.373.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-jolt-0.9.373.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
-jolt-0.9.373.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
-jolt-0.9.373.dist-info/RECORD,,
+jolt-0.9.388.dist-info/METADATA,sha256=I0CrIvzF7vxCOfmUzyfVptV0pHRVYxA9pMBrFish5DY,5763
+jolt-0.9.388.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jolt-0.9.388.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
+jolt-0.9.388.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
+jolt-0.9.388.dist-info/RECORD,,

{jolt-0.9.373.dist-info → jolt-0.9.388.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any