datashare-python 0.2.19__tar.gz → 0.2.21__tar.gz

{datashare_python-0.2.19 → datashare_python-0.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.2.19
+Version: 0.2.21
 Summary: Manage Pythoœn tasks and local resources in Datashare
 Project-URL: Homepage, https://icij.github.io/datashare-python/
 Project-URL: Documentation, https://icij.github.io/datashare-python/

{datashare_python-0.2.19 → datashare_python-0.2.21}/datashare_python/template.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import tarfile
 from copy import deepcopy
 from importlib.resources import as_file, files
@@ -22,7 +23,11 @@ ALLOWED_EXTS = {
 
 class CopyTemplateHook(BuildHookInterface):
     def initialize(self, version: str, build_data: dict[str, Any]) -> None:  # noqa: ARG002
-        build_template_tarball()
+        # Only generate the worker template when building the sources,
+        # the wheel is then generated from this first build
+        if self.target_name == "sdist":
+            build_template_tarball()
+        build_data["artifacts"].append("datashare_python/worker-template.tar.gz")
 
 
 def build_template_tarball() -> None:
@@ -44,14 +49,17 @@ def build_template_tarball() -> None:
 def init_project(name: str, path: Path) -> None:
     destination = path / name
     template_tar = files("datashare_python")
+    package_name = name.replace("-", "_").lower()
     with (
         as_file(template_tar / "worker-template.tar.gz") as tar_path,
         tarfile.open(tar_path, mode="r:gz") as tar,
     ):
         tar.extractall(destination)
+    package_dir = destination / package_name
+    shutil.move(destination / "worker_template", package_dir)
     pyproject_toml_path = destination / "pyproject.toml"
     pyproject_toml = tomlkit.loads(pyproject_toml_path.read_text())
-    pyproject_toml = _update_pyproject_toml(pyproject_toml, project_name=name)
+    pyproject_toml = _update_pyproject_toml(pyproject_toml, package_name=package_name)
     pyproject_toml_path.write_text(tomlkit.dumps(pyproject_toml))
 
 
@@ -59,10 +67,8 @@ _BASE_DEPS = {"datashare-python", "icij-common", "temporalio"}
 
 
 def _update_pyproject_toml(
-    pyproject_toml: dict[str, Any], *, project_name: str
+    pyproject_toml: dict[str, Any], *, package_name: str
 ) -> dict[str, Any]:
-    lower_snaked = project_name.replace("-", "_").lower()
-
     pyproject_toml = deepcopy(pyproject_toml)
 
     pyproject_toml["tool"]["uv"].pop("sources")
@@ -86,13 +92,19 @@ def _update_pyproject_toml(
     entry_points = project["entry-points"]
 
     wf_entry_point = entry_points["datashare.workflows"]["workflows"]
-    wf_entry_point = wf_entry_point.replace("worker_template", lower_snaked)
+    wf_entry_point = wf_entry_point.replace("worker_template", package_name)
     entry_points["datashare.workflows"]["workflows"] = wf_entry_point
 
     activities_entry_point = entry_points["datashare.activities"]["activities"]
     activities_entry_point = activities_entry_point.replace(
-        "worker_template", lower_snaked
+        "worker_template", package_name
     )
     entry_points["datashare.activities"]["activities"] = activities_entry_point
 
+    hatch_sdist = pyproject_toml["tool"]["hatch"]["build"]["targets"]["sdist"]
+    hatch_sdist["only-include"] = [
+        i if i != "worker_template" else package_name
+        for i in hatch_sdist["only-include"]
+    ]
+
     return pyproject_toml

{datashare_python-0.2.19 → datashare_python-0.2.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datashare-python"
-version = "0.2.19"
+version = "0.2.21"
 description = "Manage Pythoœn tasks and local resources in Datashare"
 authors = [
   { name = "Clément Doumouro", email = "cdoumouro@icij.org" },
@@ -47,7 +47,7 @@ only-include = ["datashare_python"]
 
 [tool.hatch.build.targets.wheel]
 artifacts = [
-  "worker-template.tar.gz"
+  "datashare_python/worker-template.tar.gz"
 ]