From ab6dab366075cde5e9d319999e9b018fbd7d7dea Mon Sep 17 00:00:00 2001 From: Jamie Alessio Date: Sun, 19 Feb 2023 12:39:33 -0800 Subject: [PATCH] Remove use of 'rvm-download' rbenv plugin --- pre_commit/languages/ruby.py | 8 ++------ pre_commit/resources/ruby-download.tar.gz | Bin 5271 -> 0 bytes testing/make-archives | 5 ----- tests/languages/ruby_test.py | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 pre_commit/resources/ruby-download.tar.gz diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py index 4416f728..cb2a1827 100644 --- a/pre_commit/languages/ruby.py +++ b/pre_commit/languages/ruby.py @@ -91,7 +91,6 @@ def _install_rbenv( # Only install ruby-build if the version is specified if version != C.DEFAULT: plugins_dir = os.path.join(envdir, 'plugins') - _extract_resource('ruby-download.tar.gz', plugins_dir) _extract_resource('ruby-build.tar.gz', plugins_dir) @@ -99,11 +98,8 @@ def _install_ruby( prefix: Prefix, version: str, ) -> None: # pragma: win32 no cover - try: - helpers.run_setup_cmd(prefix, ('rbenv', 'download', version)) - except CalledProcessError: # pragma: no cover (usually find with download) - # Failed to download from mirror for some reason, build it instead - helpers.run_setup_cmd(prefix, ('rbenv', 'install', version)) + # build from source using rbenv + ruby-build + helpers.run_setup_cmd(prefix, ('rbenv', 'install', version)) def install_environment( diff --git a/pre_commit/resources/ruby-download.tar.gz b/pre_commit/resources/ruby-download.tar.gz deleted file mode 100644 index 92502a77e79abba062c5a4fc38e5d885a9982d29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5271 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 b_U`