fractal-server 2.3.0a2__tar.gz → 2.3.0a3__tar.gz

{fractal_server-2.3.0a2 → fractal_server-2.3.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.0a2
+Version: 2.3.0a3
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.3.0a3/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.3.0a3"

{fractal_server-2.3.0a2 → fractal_server-2.3.0a3}/fractal_server/tasks/v2/background_operations_ssh.py

@@ -32,7 +32,7 @@ def _parse_script_5_stdout(stdout: str) -> dict[str, str]:
         ("Python interpreter:", "python_bin"),
         ("Package name:", "package_name"),
         ("Package version:", "package_version"),
-        ("Package parent folder:", "package_root_remote"),
+        ("Package parent folder:", "package_root_parent_remote"),
         ("Manifest absolute path:", "manifest_path_remote"),
     ]
     stdout_lines = stdout.splitlines()
@@ -253,11 +253,21 @@ def background_collect_pip_ssh(
                     logger.error(error_msg)
                     raise ValueError(error_msg)
                 # Extract/drop parsed attributes
-                pkg_attrs.pop("package_name")
+                package_name = pkg_attrs.pop("package_name")
                 python_bin = pkg_attrs.pop("python_bin")
-                package_root_remote = pkg_attrs.pop("package_root_remote")
+                package_root_parent_remote = pkg_attrs.pop(
+                    "package_root_parent_remote"
+                )
                 manifest_path_remote = pkg_attrs.pop("manifest_path_remote")
 
+                # FIXME SSH: Use more robust logic to determine `package_root`,
+                # e.g. as in the custom task-collection endpoint (where we use
+                # `importlib.util.find_spec`)
+                package_name_underscore = package_name.replace("-", "_")
+                package_root_remote = (
+                    Path(package_root_parent_remote) / package_name_underscore
+                ).as_posix()
+
                 # Read and validate remote manifest file
                 with connection.sftp().open(manifest_path_remote, "r") as f:
                     manifest = json.load(f)

{fractal_server-2.3.0a2 → fractal_server-2.3.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.3.0a2"
+version = "2.3.0a3"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -91,7 +91,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.3.0a2"
+current_version = "2.3.0a3"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.3.0a2/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.3.0a2"