From fa0f439947fcaf6c2d452ee6bbff3ac595f4b303 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Tue, 19 Jun 2018 15:29:43 +0100 Subject: [PATCH 1/2] Fix our use of `--use-wheel` in pip. Refs #4262 --- common | 2 +- readthedocs/doc_builder/python_environments.py | 1 - readthedocs/rtd_tests/tests/test_doc_building.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common b/common index e38599c2c5e..ed81bfc2608 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e38599c2c5e40d026d33528a61a1815c421a98be +Subproject commit ed81bfc2608fe23b82a22a55d8431a01762e2f02 diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 3d2aa1aba5a..e6009f8f6cc 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -253,7 +253,6 @@ def install_core_requirements(self): 'python', self.venv_bin(filename='pip'), 'install', - '--use-wheel', '--upgrade', '--cache-dir', self.project.pip_cache_path, diff --git a/readthedocs/rtd_tests/tests/test_doc_building.py b/readthedocs/rtd_tests/tests/test_doc_building.py index 512de4f7d5a..d255c555ae0 100644 --- a/readthedocs/rtd_tests/tests/test_doc_building.py +++ b/readthedocs/rtd_tests/tests/test_doc_building.py @@ -1137,7 +1137,6 @@ def setUp(self): 'python', mock.ANY, # pip path 'install', - '--use-wheel', '--upgrade', '--cache-dir', mock.ANY, # cache path From 1048af9c994d5bb2c6cff4266399885184cce93e Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Tue, 19 Jun 2018 15:30:41 +0100 Subject: [PATCH 2/2] Update common branch --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index ed81bfc2608..e38599c2c5e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ed81bfc2608fe23b82a22a55d8431a01762e2f02 +Subproject commit e38599c2c5e40d026d33528a61a1815c421a98be