Run tests for lazy wheel on Travis

Author: McSinyx

.travis.yml

@@ -38,12 +38,24 @@ jobs:
       env:
       - GROUP=1
       - NEW_RESOLVER=1
+    - env:
+      - GROUP=1
+      - NEW_RESOLVER=1
+      - LAZY_WHEEL=1
     - env:
       - GROUP=2
       - NEW_RESOLVER=1
+    - env:
+      - GROUP=2
+      - NEW_RESOLVER=1
+      - LAZY_WHEEL=1
+    - env:
+      - GROUP=3
+      - NEW_RESOLVER=1
     - env:
       - GROUP=3
       - NEW_RESOLVER=1
+      - LAZY_WHEEL=1
 
   fast_finish: true
   allow_failures:

news/8532.feature

@@ -1,3 +1,3 @@
 Allow the new resolver to obtain dependency information through wheels
 lazily downloaded using HTTP range requests.  To enable this feature,
-invoke ``pip`` with ``--use-feature=lazy-wheel``.
+invoke ``pip`` with ``--use-feature=2020-resolver-lazy-wheel``.

src/pip/_internal/cli/cmdoptions.py

@@ -916,7 +916,7 @@ def check_list_path_option(options):
     metavar='feature',
     action='append',
     default=[],
-    choices=['2020-resolver', 'lazy-wheel'],
+    choices=['2020-resolver', '2020-resolver-lazy-wheel'],
     help='Enable new functionality, that may be backward incompatible.',
 )  # type: Callable[..., Option]
 

src/pip/_internal/cli/req_command.py

@@ -254,10 +254,18 @@ def make_resolver(
             isolated=options.isolated_mode,
             use_pep517=use_pep517,
         )
+
+        if '2020-resolver-lazy-wheel' in options.features_enabled:
+            use_2020_resolver = use_lazy_wheel = True
+        elif '2020-resolver' in options.features_enabled:
+            use_2020_resolver, use_lazy_wheel = True, False
+        else:
+            use_2020_resolver = use_lazy_wheel = False
+
         # The long import name and duplicated invocation is needed to convince
         # Mypy into correctly typechecking. Otherwise it would complain the
         # "Resolver" class being redefined.
-        if '2020-resolver' in options.features_enabled:
+        if use_2020_resolver:
             import pip._internal.resolution.resolvelib.resolver
             return pip._internal.resolution.resolvelib.resolver.Resolver(
                 preparer=preparer,
@@ -271,7 +279,7 @@ def make_resolver(
                 force_reinstall=force_reinstall,
                 upgrade_strategy=upgrade_strategy,
                 py_version_info=py_version_info,
-                lazy_wheel='lazy-wheel' in options.features_enabled,
+                lazy_wheel=use_lazy_wheel,
             )
         import pip._internal.resolution.legacy.resolver
         return pip._internal.resolution.legacy.resolver.Resolver(

tests/conftest.py

@@ -47,6 +47,12 @@ def pytest_addoption(parser):
         default=False,
         help="run the skipped tests for the new resolver",
     )
+    parser.addoption(
+        "--lazy-wheel",
+        action="store_true",
+        default=False,
+        help="use lazy wheels in tests (only affect new resolver)",
+    )
     parser.addoption(
         "--use-venv",
         action="store_true",
@@ -102,12 +108,16 @@ def pytest_collection_modifyitems(config, items):
 @pytest.fixture(scope="session", autouse=True)
 def use_new_resolver(request):
     """Set environment variable to make pip default to the new resolver.
+
+    Lazy wheel, an optimization, is also decided here.
     """
     new_resolver = request.config.getoption("--new-resolver")
-    if new_resolver:
-        os.environ["PIP_USE_FEATURE"] = "2020-resolver"
-    else:
+    if not new_resolver:
         os.environ.pop("PIP_USE_FEATURE", None)
+    elif request.config.getoption("--lazy-wheel"):
+        os.environ["PIP_USE_FEATURE"] = "2020-resolver-lazy-wheel"
+    else:
+        os.environ["PIP_USE_FEATURE"] = "2020-resolver"
     yield new_resolver
 
 

tools/travis/run.sh

@@ -43,22 +43,28 @@ else
     RESOLVER_SWITCH='--new-resolver'
 fi
 
+if [[ -z "$LAZY_WHEEL" ]]; then
+    LAZY_WHEEL_SWITCH=''
+else
+    LAZY_WHEEL_SWITCH='--lazy-wheel'
+fi
+
 # Print the commands run for this test.
 set -x
 if [[ "$GROUP" == "1" ]]; then
     # Unit tests
     tox -- --use-venv -m unit -n auto
     # Integration tests (not the ones for 'pip install')
     tox -- -m integration -n auto --duration=5 -k "not test_install" \
-        --use-venv $RESOLVER_SWITCH
+        --use-venv $RESOLVER_SWITCH $LAZY_WHEEL_SWITCH
 elif [[ "$GROUP" == "2" ]]; then
     # Separate Job for running integration tests for 'pip install'
     tox -- -m integration -n auto --duration=5 -k "test_install" \
-        --use-venv $RESOLVER_SWITCH
+        --use-venv $RESOLVER_SWITCH $LAZY_WHEEL_SWITCH
 elif [[ "$GROUP" == "3" ]]; then
     # Separate Job for tests that fail with the new resolver
     tox -- -m fails_on_new_resolver -n auto --duration=5 \
-        --use-venv $RESOLVER_SWITCH --new-resolver-runtests
+        --use-venv $RESOLVER_SWITCH --new-resolver-runtests $LAZY_WHEEL_SWITCH
 else
     # Non-Testing Jobs should run once
     tox