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 92502a77..00000000 Binary files a/pre_commit/resources/ruby-download.tar.gz and /dev/null differ diff --git a/testing/make-archives b/testing/make-archives index cec9a9ff..d0da31e2 100755 --- a/testing/make-archives +++ b/testing/make-archives @@ -18,11 +18,6 @@ from typing import Sequence REPOS = ( ('rbenv', 'https://github.com/rbenv/rbenv', '38e1fbb'), ('ruby-build', 'https://github.com/rbenv/ruby-build', '9d92a69'), - ( - 'ruby-download', - 'https://github.com/garnieretienne/rvm-download', - '09bd7c6', - ), ) diff --git a/tests/languages/ruby_test.py b/tests/languages/ruby_test.py index 9cfaad5d..589e64a7 100644 --- a/tests/languages/ruby_test.py +++ b/tests/languages/ruby_test.py @@ -37,7 +37,7 @@ def test_uses_system_if_both_gem_and_ruby_are_available(find_exe_mck): @pytest.mark.parametrize( 'filename', - ('rbenv.tar.gz', 'ruby-build.tar.gz', 'ruby-download.tar.gz'), + ('rbenv.tar.gz', 'ruby-build.tar.gz'), ) def test_archive_root_stat(filename): with resource_bytesio(filename) as f: