Merge pull request #7412 from readthedocs/test-new-resolver

Pip: test new resolver

Author: stsewd

readthedocs/doc_builder/python_environments.py

@@ -106,6 +106,7 @@ def install_package(self, install):
                 '--upgrade-strategy',
                 'eager',
                 *self._pip_cache_cmd_argument(),
+                *self._pip_extra_args(),
                 '{path}{extra_requirements}'.format(
                     path=local_path,
                     extra_requirements=extra_req_param,
@@ -123,6 +124,12 @@ def install_package(self, install):
                 bin_path=self.venv_bin(),
             )
 
+    def _pip_extra_args(self):
+        extra_args = []
+        if self.project.has_feature(Feature.USE_NEW_PIP_RESOLVER):
+            extra_args.extend(['--use-feature', '2020-resolver'])
+        return extra_args
+
     def _pip_cache_cmd_argument(self):
         """
         Return the pip command ``--cache-dir`` or ``--no-cache-dir`` argument.
@@ -383,6 +390,7 @@ def install_core_requirements(self):
             ])
 
         cmd = copy.copy(pip_install_cmd)
+        cmd.extend(self._pip_extra_args())
         if self.config.python.use_system_site_packages:
             # Other code expects sphinx-build to be installed inside the
             # virtualenv.  Using the -I option makes sure it gets installed
@@ -431,6 +439,7 @@ def install_requirements_file(self, install):
                 '-m',
                 'pip',
                 'install',
+                *self._pip_extra_args(),
             ]
             if self.project.has_feature(Feature.PIP_ALWAYS_UPGRADE):
                 args += ['--upgrade']
@@ -647,6 +656,7 @@ def install_core_requirements(self):
             'install',
             '-U',
             *self._pip_cache_cmd_argument(),
+            *self._pip_extra_args(),
         ]
         pip_cmd.extend(pip_requirements)
         self.build_env.run(

readthedocs/projects/models.py

@@ -1554,6 +1554,7 @@ def add_features(sender, **kwargs):
     DEFAULT_TO_FUZZY_SEARCH = 'default_to_fuzzy_search'
     INDEX_FROM_HTML_FILES = 'index_from_html_files'
     DONT_CREATE_INDEX = 'dont_create_index'
+    USE_NEW_PIP_RESOLVER = 'use_new_pip_resolver'
 
     FEATURES = (
         (USE_SPHINX_LATEST, _('Use latest version of Sphinx')),
@@ -1693,6 +1694,10 @@ def add_features(sender, **kwargs):
             DONT_CREATE_INDEX,
             _('Do not create index.md or README.rst if the project does not have one.'),
         ),
+        (
+            USE_NEW_PIP_RESOLVER,
+            _('Use new pip resolver'),
+        ),
     )
 
     projects = models.ManyToManyField(