Fix bad merge from upstream

Netflix · Sep 14, 2023 · aa74fd2 · aa74fd2
1 parent 372177e
commit aa74fd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/metaflow_extensions/netflix_ext/plugins/conda/conda.py b/metaflow_extensions/netflix_ext/plugins/conda/conda.py
@@ -1715,9 +1715,10 @@ def _find_conda_binary(self):
             if self._mode == "local":
                 self._ensure_local_conda()
             else:
-                # Encapsulating remote conda installation and verification into a single function call,
-                # to perform retries with exponential backoffs as we are seeing some text file busy errors
-                self._download_validate_remote_conda()
+                self._ensure_remote_conda()
+                err = self._validate_conda_installation()
+                if err:
+                    raise err
             self._found_binaries = True
 
     def _ensure_local_conda(self):
@@ -1753,6 +1754,9 @@ def _ensure_local_conda(self):
                 "pip": which("pip"),
             }
             self._bins["conda"] = self._bins[self._conda_executable_type]
+            err = self._validate_conda_installation():
+            if err:
+                raise err
 
     def _install_local_conda(self):
         start = time.time()

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_namespace_packages
 
-version = "1.0.1"
+version = "1.0.2"
 
 setup(
     name="metaflow-netflixext",