Skip to content

Commit fa7ca9c

Browse files
committed
Rename experimental feature lazy-wheel to fast-deps
1 parent 4db613c commit fa7ca9c

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ jobs:
4141
- env:
4242
- GROUP=1
4343
- NEW_RESOLVER=1
44-
- LAZY_WHEEL=1
44+
- FAST_DEPS=1
4545
- env:
4646
- GROUP=2
4747
- NEW_RESOLVER=1
4848
- env:
4949
- GROUP=2
5050
- NEW_RESOLVER=1
51-
- LAZY_WHEEL=1
51+
- FAST_DEPS=1
5252
- env:
5353
- GROUP=3
5454
- NEW_RESOLVER=1
5555
- env:
5656
- GROUP=3
5757
- NEW_RESOLVER=1
58-
- LAZY_WHEEL=1
58+
- FAST_DEPS=1
5959

6060
fast_finish: true
6161
allow_failures:
@@ -65,7 +65,7 @@ jobs:
6565
- env:
6666
- GROUP=3
6767
- NEW_RESOLVER=1
68-
- LAZY_WHEEL=1
68+
- FAST_DEPS=1
6969

7070
before_install: tools/travis/setup.sh
7171
install: travis_retry tools/travis/install.sh

news/8532.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Allow the new resolver to obtain dependency information through wheels
22
lazily downloaded using HTTP range requests. To enable this feature,
3-
invoke ``pip`` with ``--use-feature=lazy-wheel``.
3+
invoke ``pip`` with ``--use-feature=fast-deps``.

src/pip/_internal/cli/cmdoptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ def check_list_path_option(options):
916916
metavar='feature',
917917
action='append',
918918
default=[],
919-
choices=['2020-resolver', 'lazy-wheel'],
919+
choices=['2020-resolver', 'fast-deps'],
920920
help='Enable new functionality, that may be backward incompatible.',
921921
) # type: Callable[..., Option]
922922

src/pip/_internal/cli/req_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def make_resolver(
271271
force_reinstall=force_reinstall,
272272
upgrade_strategy=upgrade_strategy,
273273
py_version_info=py_version_info,
274-
lazy_wheel='lazy-wheel' in options.features_enabled,
274+
lazy_wheel='fast-deps' in options.features_enabled,
275275
)
276276
import pip._internal.resolution.legacy.resolver
277277
return pip._internal.resolution.legacy.resolver.Resolver(

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def pytest_addoption(parser):
4848
help="run the skipped tests for the new resolver",
4949
)
5050
parser.addoption(
51-
"--lazy-wheel",
51+
"--fast-deps",
5252
action="store_true",
5353
default=False,
5454
help="use lazy wheels in tests (only affect new resolver)",
@@ -114,8 +114,8 @@ def use_new_resolver(request):
114114
new_resolver = request.config.getoption("--new-resolver")
115115
if not new_resolver:
116116
os.environ.pop("PIP_USE_FEATURE", None)
117-
elif request.config.getoption("--lazy-wheel"):
118-
os.environ["PIP_USE_FEATURE"] = "2020-resolver lazy-wheel"
117+
elif request.config.getoption("--fast-deps"):
118+
os.environ["PIP_USE_FEATURE"] = "2020-resolver fast-deps"
119119
else:
120120
os.environ["PIP_USE_FEATURE"] = "2020-resolver"
121121
yield new_resolver

tools/travis/run.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ else
4343
RESOLVER_SWITCH='--new-resolver'
4444
fi
4545

46-
if [[ -z "$LAZY_WHEEL" ]]; then
47-
LAZY_WHEEL_SWITCH=''
46+
if [[ -z "$FAST_DEPS" ]]; then
47+
FAST_DEPS_SWITCH=''
4848
else
49-
LAZY_WHEEL_SWITCH='--lazy-wheel'
49+
FAST_DEPS_SWITCH='--fast-deps'
5050
fi
5151

5252
# Print the commands run for this test.
@@ -64,7 +64,7 @@ elif [[ "$GROUP" == "2" ]]; then
6464
elif [[ "$GROUP" == "3" ]]; then
6565
# Separate Job for tests that fail with the new resolver
6666
tox -- -m fails_on_new_resolver -n auto --duration=5 \
67-
--use-venv $RESOLVER_SWITCH --new-resolver-runtests $LAZY_WHEEL_SWITCH
67+
--use-venv $RESOLVER_SWITCH --new-resolver-runtests $FAST_DEPS_SWITCH
6868
else
6969
# Non-Testing Jobs should run once
7070
tox

0 commit comments

Comments
 (0)