jolt 0.9.355__py3-none-any.whl → 0.9.370__py3-none-any.whl

jolt/plugins/ninja-compdb.py

@@ -115,7 +115,7 @@ def get_task_artifacts(task):
 
 class CompDBHooks(TaskHook):
     def __init__(self):
-        self._depfiles = config.getboolean("ninja-compdb", "depfiles", True)
+        self._depfiles = config.getboolean("ninja-compdb", "depfiles", False)
 
     def publish_compdb(self, artifact, tools):
         with tools.cwd(self.outdir):
@@ -226,19 +226,18 @@ def compdb(ctx, task, default):
 
     """
 
-    manifest = ctx.obj["manifest"]
     options = JoltOptions(default=default)
     acache = cache.ArtifactCache.get(options)
     TaskHookRegistry.get(options)
     executors = scheduler.ExecutorRegistry.get(options)
     registry = TaskRegistry.get()
     strategy = scheduler.DownloadStrategy(executors, acache)
-    queue = scheduler.TaskQueue(strategy, acache, {})
+    queue = scheduler.TaskQueue()
 
     for params in default:
         registry.set_default_parameters(params)
 
-    gb = graph.GraphBuilder(registry, acache, manifest, options, progress=True)
+    gb = graph.GraphBuilder(registry, acache, options, progress=True)
     dag = gb.build(task)
 
     try:
@@ -251,9 +250,10 @@ def compdb(ctx, task, default):
 
                 while leafs:
                     task = leafs.pop()
-                    queue.submit(task)
+                    executor = strategy.create_executor({}, task)
+                    queue.submit(executor)
 
-                task, error = queue.wait()
+                task, _ = queue.wait()
 
                 # Materialize workspace resources so that
                 # source code is available to the debugger.
@@ -272,6 +272,7 @@ def compdb(ctx, task, default):
         log.warning("Interrupted by user")
         try:
             queue.abort()
+            executors.shutdown()
             sys.exit(1)
         except KeyboardInterrupt:
             print()

jolt/plugins/podman.py

@@ -206,8 +206,8 @@ class Container(Resource):
     """
 
     volumes_default = [
-        "{joltdir}:{joltdir}",
-        "{joltcachedir}:{joltcachedir}",
+        "{joltdir}",
+        "{joltcachedir}",
     ]
     """
     A list of default volumes to mount.
@@ -247,7 +247,7 @@ class Container(Resource):
     def _image(self):
         registry = TaskRegistry.get()
         tool = tools.Tools(self)
-        if registry.get_task_class(tool.expand(self.image)):
+        if registry.get_task(tool.expand(self.image)):
             return [self.image]
         return []
 
@@ -284,7 +284,7 @@ class Container(Resource):
 
     @property
     def _volumes(self):
-        return " ".join([utils.option("-v ", self.tools.expand(vol))
+        return " ".join([utils.option("-v ", self.tools.expand_path(vol))
                          for vol in self.volumes_default + self.volumes])
 
     def acquire(self, artifact, deps, tools, owner):

jolt/plugins/scheduler.py

@@ -13,7 +13,6 @@ from jolt import config
 from jolt import hooks
 from jolt import loader
 from jolt import log
-from jolt import manifest
 from jolt import common_pb2 as common_pb
 from jolt import scheduler
 from jolt import utils
@@ -145,6 +144,15 @@ class RemoteExecutor(NetworkExecutor):
         self.session = session
         self.task = task
 
+    def schedule(self, env):
+        """
+        Schedule the task for execution.
+
+        The task is marked as in progress before scheduling.
+        """
+        self.task.set_in_progress()
+        return super().schedule(env)
+
     def cancel(self):
         """
         Cancel the build session.
@@ -436,21 +444,11 @@ class RemoteSession(object):
         if self.build:
             return
 
-        registry = ExecutorRegistry.get()
-
         if not self.buildenv:
-            # Create a list of parameters to send to the scheduler.
-            parameters = []
-            for key, value in registry.get_network_parameters(None).items():
-                parameters.append(common_pb.Property(key=key, value=value))
-
-            # Add parameters from the config / command line (-c params.key).
-            parameters.extend(config.export_params())
-
             # Create the build environment.
             self.buildenv = common_pb.BuildEnvironment(
                 client=selfdeploy.get_client(),
-                parameters=parameters,
+                parameters=config.export_params(),
                 task_default_parameters=scheduler.export_task_default_params(self.tasks),
                 tasks=scheduler.export_tasks(self.tasks + self.pruned),
                 workspace=loader.export_workspace(self.tasks),
@@ -580,8 +578,14 @@ def executor(ctx, worker, build, request):
     loglevel = request.environment.loglevel
     log.set_level_pb(loglevel)
 
-    # Import protobuf build description
-    manifest.ManifestExtensionRegistry.import_protobuf(request.environment)
+    # Import workspace
+    loader.import_workspace(request.environment)
+
+    # Import configuration snippet
+    config.import_config(request.environment.config)
+
+    # Import configuration parameters (-c params.key)
+    config.import_params({param.key: param.value for param in request.environment.parameters})
 
     options = JoltOptions(
         network=True,

jolt/plugins/selfdeploy/setup.py

@@ -92,7 +92,7 @@ setup(
     dependency_links=[],
     extras_require={
         "allure": ["allure-python-commons"],
-        "conan": ["conan<2.0"],
+        "conan": ["conan>=2.0"],
         "dev": ["check-manifest"],
         "doc": ["sphinx-click", "sphinx-rtd-theme"],
         "test": ["coverage"],

jolt/plugins/selfdeploy.py

@@ -12,12 +12,9 @@ from jolt.cache import ArtifactCache
 from jolt.error import raise_error_if
 from jolt.graph import GraphBuilder
 from jolt.loader import JoltLoader
-from jolt.manifest import JoltManifest
 from jolt.scheduler import JoltEnvironment
 from jolt.scheduler import LocalExecutor
 from jolt.scheduler import LocalExecutorFactory
-from jolt.scheduler import NetworkExecutorExtension
-from jolt.scheduler import NetworkExecutorExtensionFactory
 from jolt.tasks import Task, TaskRegistry
 
 
@@ -99,24 +96,6 @@ class Jolt(Task):
                     artifact.collect(fs.path.basename(e))
 
 
-class SelfDeployExtension(NetworkExecutorExtension):
-    @utils.cached.instance
-    def get_parameters(self, _):
-        client = get_client()
-        params = {}
-        if client.identity:
-            params["jolt_identity"] = client.identity
-        if client.url:
-            params["jolt_url"] = client.url
-        return params
-
-
-@NetworkExecutorExtensionFactory.Register
-class SelfDeployExtensionFactory(NetworkExecutorExtensionFactory):
-    def create(self):
-        return SelfDeployExtension()
-
-
 @utils.cached.method
 def get_dependencies(packages=None):
     reqs = packages or ["jolt"]
@@ -157,7 +136,7 @@ def publish_artifact():
     registry.add_task_class(Jolt)
     acache = ArtifactCache.get()
     env = JoltEnvironment(cache=acache, queue=None)
-    gb = GraphBuilder(registry, acache, JoltManifest())
+    gb = GraphBuilder(registry, acache)
     dag = gb.build(["jolt"])
     task = dag.select(lambda graph, task: True)
     assert len(task) == 1, "Too many selfdeploy tasks found"

jolt/plugins/strings.py

@@ -2,6 +2,18 @@ from jolt.cache import ArtifactAttributeSetProvider
 
 
 class StringVariableSet(object):
+    """
+    A set of string variables for an artifact.
+
+    Example:
+
+    .. code-block:: python
+
+        artifact.strings.foo = "bar"
+        print(artifact.strings.foo)
+
+    """
+
     def __init__(self, artifact):
         super(StringVariableSet, self).__setattr__("_attributes", {})
         super(StringVariableSet, self).__setattr__("_artifact", artifact)
@@ -29,6 +41,10 @@ class StringVariableSet(object):
 
 @ArtifactAttributeSetProvider.Register
 class StringVariableSetProvider(ArtifactAttributeSetProvider):
+    """
+    A provider of string variable sets.
+    """
+
     def create(self, artifact):
         setattr(artifact, "strings", StringVariableSet(artifact))
 
@@ -45,9 +61,3 @@ class StringVariableSetProvider(ArtifactAttributeSetProvider):
 
         for key, value in artifact.strings.items():
             content["strings"][key] = str(value)
-
-    def apply(self, task, artifact):
-        pass
-
-    def unapply(self, task, artifact):
-        pass