From 7ad3acc8faa151e307c82b659f884205ef47012b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 27 Jan 2021 17:04:13 +0100
Subject: Merging upstream version 2.9.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 pre_commit/languages/dotnet.py | 7 +++----
 pre_commit/languages/python.py | 2 +-
 pre_commit/languages/ruby.py   | 4 +++-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'pre_commit/languages')

diff --git a/pre_commit/languages/dotnet.py b/pre_commit/languages/dotnet.py
index a8abc86..094d2f1 100644
--- a/pre_commit/languages/dotnet.py
+++ b/pre_commit/languages/dotnet.py
@@ -12,7 +12,6 @@ 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 rmtree
 
 ENVIRONMENT_DIR = 'dotnetenv'
 BIN_DIR = 'bin'
@@ -76,9 +75,9 @@ def install_environment(
             ),
         )
 
-        # Cleanup build output
-        for d in ('bin', 'obj', build_dir):
-            rmtree(prefix.path(d))
+        # Clean the git dir, ignoring the environment dir
+        clean_cmd = ('git', 'clean', '-ffxd', '-e', f'{ENVIRONMENT_DIR}-*')
+        helpers.run_setup_cmd(prefix, clean_cmd)
 
 
 def run_hook(
diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py
index 65f521c..43b7280 100644
--- a/pre_commit/languages/python.py
+++ b/pre_commit/languages/python.py
@@ -36,7 +36,7 @@ def _version_info(exe: str) -> str:
 
 def _read_pyvenv_cfg(filename: str) -> Dict[str, str]:
     ret = {}
-    with open(filename) as f:
+    with open(filename, encoding='UTF-8') as f:
         for line in f:
             try:
                 k, v = line.split('=')
diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py
index 1a0f0c7..81bc954 100644
--- a/pre_commit/languages/ruby.py
+++ b/pre_commit/languages/ruby.py
@@ -52,7 +52,6 @@ def get_env_patch(
     else:  # pragma: win32 no cover
         patches += (
             ('RBENV_ROOT', venv),
-            ('RBENV_VERSION', language_version),
             (
                 'PATH', (
                     os.path.join(venv, 'gems', 'bin'), os.pathsep,
@@ -61,6 +60,9 @@ def get_env_patch(
                 ),
             ),
         )
+    if language_version not in {'system', 'default'}:  # pragma: win32 no cover
+        patches += (('RBENV_VERSION', language_version),)
+
     return patches
 
 
-- 
cgit v1.2.3