wip: fixed remote execution pip-git-pkg support

metaflow/plugins/pypi/bootstrap.py

@@ -107,9 +107,10 @@
                 shutil.move(tmpfile, dest)
 
         # Install PyPI packages.
+        # *.whl for regular index sources, *.zip for VCS sources
         cmds.extend(
             [
-                f"""./micromamba run --prefix {prefix} pip --disable-pip-version-check install --root-user-action=ignore --no-compile {pypi_pkgs_dir}/*.whl"""
+                f"""./micromamba run --prefix {prefix} pip --disable-pip-version-check install --root-user-action=ignore --no-compile {pypi_pkgs_dir}/*"""
             ]
         )
 

metaflow/plugins/pypi/conda_environment.py

@@ -97,10 +97,17 @@ def solve(id_, environment, type_):
             )
 
         def cache(storage, results, type_):
+            def _url(url, local_path):
+                base, _file = os.path.split(urlparse(url).path)
+                _, localfile = os.path.split(local_path)
+                return urlparse(url).netloc + os.path.join(base, localfile)
+
             local_packages = {
                 url: {
                     # Path to package in datastore.
-                    "path": urlparse(url).netloc + urlparse(url).path,
+                    # e.g. example.com/path/to/package.whl
+                    # or example.com/path/to/package.git@123abc
+                    "path": _url(url, local_path),
                     # Path to package on local disk.
                     "local_path": local_path,
                 }
@@ -117,10 +124,8 @@ def cache(storage, results, type_):
                     else:
                         # TODO: Match up with CONDA_DATASTORE_ROOT so that cache
                         #       gets invalidated when DATASTORE is moved.
-                        package["path"] = (
-                            urlparse(package["url"]).netloc
-                            + urlparse(package["url"]).path
-                        )
+                        _p = package.get("wheel_name", urlparse(package["url"]).path)
+                        package["path"] = _url(package["url"], _p)
                         dirty.add(id_)
 
             list_of_path_and_filehandle = [
@@ -360,7 +365,8 @@ def __init__(self, filename, mode="rb", url=None):
         super().__init__()
         self.filename = filename
         self.mode = mode
-        self.url = url
+        # Do not handle VCS url's, as they are not pointers to files that could be downloaded.
+        self.url = None if url.startswith("git+") else url
         self._file = None
         self._buffer = None
         self._position = 0