Adding upstream version 3.0.2.upstream/3.0.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 45 deletions

diff --git a/pre_commit/languages/dart.py b/pre_commit/languages/dart.py
index 55ecbf4..e3c1c58 100644
--- a/pre_commit/languages/dart.py
+++ b/pre_commit/languages/dart.py
@@ -7,21 +7,19 @@ import tempfile
 from typing import Generator
 from typing import Sequence
 
-import pre_commit.constants as C
 from pre_commit.envcontext import envcontext
 from pre_commit.envcontext import PatchesT
 from pre_commit.envcontext import Var
-from pre_commit.hook import Hook
 from pre_commit.languages import helpers
 from pre_commit.prefix import Prefix
-from pre_commit.util import clean_path_on_failure
 from pre_commit.util import win_exe
-from pre_commit.util import yaml_load
+from pre_commit.yaml import yaml_load
 
 ENVIRONMENT_DIR = 'dartenv'
 
 get_default_version = helpers.basic_get_default_version
 health_check = helpers.basic_health_check
+run_hook = helpers.basic_run_hook
 
 
 def get_env_patch(venv: str) -> PatchesT:
@@ -31,9 +29,8 @@ def get_env_patch(venv: str) -> PatchesT:
 
 
 @contextlib.contextmanager
-def in_env(prefix: Prefix) -> Generator[None, None, None]:
-    directory = helpers.environment_dir(ENVIRONMENT_DIR, C.DEFAULT)
-    envdir = prefix.path(directory)
+def in_env(prefix: Prefix, version: str) -> Generator[None, None, None]:
+    envdir = helpers.environment_dir(prefix, ENVIRONMENT_DIR, version)
     with envcontext(get_env_patch(envdir)):
         yield
 
@@ -45,7 +42,7 @@ def install_environment(
 ) -> None:
     helpers.assert_version_default('dart', version)
 
-    envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version))
+    envdir = helpers.environment_dir(prefix, ENVIRONMENT_DIR, version)
     bin_dir = os.path.join(envdir, 'bin')
 
     def _install_dir(prefix_p: Prefix, pub_cache: str) -> None:
@@ -67,44 +64,34 @@ def install_environment(
                 env=dart_env,
             )
 
-    with clean_path_on_failure(envdir):
-        os.makedirs(bin_dir)
+    os.makedirs(bin_dir)
 
-        with tempfile.TemporaryDirectory() as tmp:
-            _install_dir(prefix, tmp)
+    with tempfile.TemporaryDirectory() as tmp:
+        _install_dir(prefix, tmp)
 
-        for dep_s in additional_dependencies:
-            with tempfile.TemporaryDirectory() as dep_tmp:
-                dep, _, version = dep_s.partition(':')
-                if version:
-                    dep_cmd: tuple[str, ...] = (dep, '--version', version)
-                else:
-                    dep_cmd = (dep,)
+    for dep_s in additional_dependencies:
+        with tempfile.TemporaryDirectory() as dep_tmp:
+            dep, _, version = dep_s.partition(':')
+            if version:
+                dep_cmd: tuple[str, ...] = (dep, '--version', version)
+            else:
+                dep_cmd = (dep,)
 
-                helpers.run_setup_cmd(
-                    prefix,
-                    ('dart', 'pub', 'cache', 'add', *dep_cmd),
-                    env={**os.environ, 'PUB_CACHE': dep_tmp},
-                )
+            helpers.run_setup_cmd(
+                prefix,
+                ('dart', 'pub', 'cache', 'add', *dep_cmd),
+                env={**os.environ, 'PUB_CACHE': dep_tmp},
+            )
 
-                # try and find the 'pubspec.yaml' that just got added
-                for root, _, filenames in os.walk(dep_tmp):
-                    if 'pubspec.yaml' in filenames:
-                        with tempfile.TemporaryDirectory() as copied:
-                            pkg = os.path.join(copied, 'pkg')
-                            shutil.copytree(root, pkg)
-                            _install_dir(Prefix(pkg), dep_tmp)
-                        break
-                else:
-                    raise AssertionError(
-                        f'could not find pubspec.yaml for {dep_s}',
-                    )
-
-
-def run_hook(
-        hook: Hook,
-        file_args: Sequence[str],
-        color: bool,
-) -> tuple[int, bytes]:
-    with in_env(hook.prefix):
-        return helpers.run_xargs(hook, hook.cmd, file_args, color=color)
+            # try and find the 'pubspec.yaml' that just got added
+            for root, _, filenames in os.walk(dep_tmp):
+                if 'pubspec.yaml' in filenames:
+                    with tempfile.TemporaryDirectory() as copied:
+                        pkg = os.path.join(copied, 'pkg')
+                        shutil.copytree(root, pkg)
+                        _install_dir(Prefix(pkg), dep_tmp)
+                    break
+            else:
+                raise AssertionError(
+                    f'could not find pubspec.yaml for {dep_s}',
+                )