jolt 0.9.342__py3-none-any.whl → 0.9.429__py3-none-any.whl

jolt/plugins/selfdeploy.py

@@ -1,5 +1,5 @@
+import importlib_metadata
 import os
-import pkg_resources
 
 from jolt import config
 from jolt import filesystem as fs
@@ -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,43 +96,37 @@ 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"]
     pkgs = {}
+    skip = set()
 
     while reqs:
         req = reqs.pop()
 
-        dist = pkg_resources.working_set.by_key.get(req)
+        try:
+            dist = importlib_metadata.distribution(req)
+        except (ImportError, importlib_metadata.PackageNotFoundError):
+            dist = None
+        except Exception:
+            dist = None
         if dist is None:
-            log.debug("[SelfDeploy] Dependency not found: {}", req)
-            pkgs[req] = req
+            skip.add(req)
             continue
 
-        for dep in dist.requires():
-            if dep.name not in pkgs:
-                reqs.append(dep.name)
+        for dep in dist.requires or []:
+            dep = dep.split(" ", 1)[0].strip()
+            dep = dep.split("[", 1)[0].strip()
+            dep = dep.split(";", 1)[0].strip()
+            dep = dep.split(">", 1)[0].strip()
+            dep = dep.split("=", 1)[0].strip()
+            dep = dep.split("<", 1)[0].strip()
+            dep = dep.split("!", 1)[0].strip()
+            if dep not in pkgs and dep not in skip:
+                reqs.append(dep)
 
-        pkgs[req] = f"{dist.project_name}=={dist.version}"
+        pkgs[req] = f"{dist.name}=={dist.version}"
 
     try:
         del pkgs["jolt"]
@@ -157,7 +148,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,23 +2,34 @@ 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)
 
     def _get_attributes(self):
         return self._attributes
 
     def __getattr__(self, name):
         attributes = self._get_attributes()
-        if name not in attributes:
-            return None
-        return attributes[name]
+        return attributes.get(name, None)
 
     def __setattr__(self, name, value):
         if not isinstance(value, str):
             raise ValueError(f"Value assigned to artifact.strings.{name} must be a string, got {type(value)}")
         attributes = self._get_attributes()
-        attributes[name] = value
+        attributes[name] = self._artifact.tools.expand(value)
         return value
 
     def __dict__(self):
@@ -30,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))
 
@@ -46,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