datashare-python 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

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
@@ -48,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))
 
 
@@ -63,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")
@@ -90,13 +92,17 @@ 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"]["wheel"]
+    hatch_sdist["packages"] = [
+        i if i != "worker_template" else package_name for i in hatch_sdist["packages"]
+    ]
 
     return pyproject_toml

{datashare_python-0.2.20.dist-info → datashare_python-0.2.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.2.20
+Version: 0.2.22
 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.20.dist-info → datashare_python-0.2.22.dist-info}/RECORD

@@ -10,10 +10,10 @@ datashare_python/exceptions.py,sha256=bVHEAXxDPKfxeeMC0hJXEsrJkgsKO2ESAhxWU96GA4
 datashare_python/local_client.py,sha256=GP9MTcHVQ1mcb2eO6TiQ7mzQdx199lZRhK8DRuJqJVQ,2359
 datashare_python/objects.py,sha256=UDc9PDaSXADLgmnfvqGBrDTmPVL-rRpyNHvY277-1x8,4147
 datashare_python/task_client.py,sha256=oTmP8bvZW0UyhLNMi1AV3XIAx7hrdbxNRss2Mw2azEc,8435
-datashare_python/template.py,sha256=esOppyXgVvWt2FexMVOdndddPVIR6j168dD39qMRwRY,3402
+datashare_python/template.py,sha256=pamdaqnj3r00MESNLZuB7gCETylU_I42T7qo88607v8,3726
 datashare_python/types_.py,sha256=9Hk1XqpdXbM1TnEzwvJ5G9ABbaCZW9KgBTtiPBVn_7k,649
 datashare_python/utils.py,sha256=mFegsYFoIRzRtPhx12748qrahe-c0rKNx02-r8tTG8Q,12777
-datashare_python/worker-template.tar.gz,sha256=NtHCgIz6TUNBgJCPQRb5J04le32PgVPR5I4o7EszjjQ,142445
+datashare_python/worker-template.tar.gz,sha256=amYr83agrHKIj9ymiF6PbV1XVN7CD09qwCavvxG21qY,142859
 datashare_python/worker.py,sha256=E1cECV0q2XcGI234gZZ5eBvqeULlTK0FUb0VSWkRQUI,2924
 datashare_python/cli/__init__.py,sha256=5MGSE_0SwlOiwbyPwsP8RIXlTBB2_GGP0zDg4l6UAIY,1479
 datashare_python/cli/local.py,sha256=S-7qMpSqzi0oMvu01TCFEb8tayEvpw4pXMdCszKEYtU,986
@@ -21,7 +21,7 @@ datashare_python/cli/project.py,sha256=w32Gy9AOL5B00uDT4in7YUCt2g68FnNbvwg2M3a8G
 datashare_python/cli/task.py,sha256=9If5OC7loG4C4gWWl4iOeqPJ4GOLlCWXQfuNLUHORrQ,5860
 datashare_python/cli/utils.py,sha256=p69CQb0zfixuyBkiZprhdMCc_NuYwXyAn6vC9H1UzAw,911
 datashare_python/cli/worker.py,sha256=lmxeZDhLbGb-98XplCERN3R3Yo-sU0UkhO7KIo9Zbo4,4401
-datashare_python-0.2.20.dist-info/METADATA,sha256=kmwue8v3rDgYRG-NYwr4vEFE6X9L39FkqiMNeGIwupw,959
-datashare_python-0.2.20.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-datashare_python-0.2.20.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.2.20.dist-info/RECORD,,
+datashare_python-0.2.22.dist-info/METADATA,sha256=fvWeOHnHN3gkX7uYAYk6iDAQYL66eJGR26sZaCAKlJ8,959
+datashare_python-0.2.22.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+datashare_python-0.2.22.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
+datashare_python-0.2.22.dist-info/RECORD,,