File tree 6 files changed +14
-14
lines changed 6 files changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -41,21 +41,21 @@ jobs:
41
41
- env :
42
42
- GROUP=1
43
43
- NEW_RESOLVER=1
44
- - LAZY_WHEEL =1
44
+ - FAST_DEPS =1
45
45
- env :
46
46
- GROUP=2
47
47
- NEW_RESOLVER=1
48
48
- env :
49
49
- GROUP=2
50
50
- NEW_RESOLVER=1
51
- - LAZY_WHEEL =1
51
+ - FAST_DEPS =1
52
52
- env :
53
53
- GROUP=3
54
54
- NEW_RESOLVER=1
55
55
- env :
56
56
- GROUP=3
57
57
- NEW_RESOLVER=1
58
- - LAZY_WHEEL =1
58
+ - FAST_DEPS =1
59
59
60
60
fast_finish : true
61
61
allow_failures :
65
65
- env :
66
66
- GROUP=3
67
67
- NEW_RESOLVER=1
68
- - LAZY_WHEEL =1
68
+ - FAST_DEPS =1
69
69
70
70
before_install : tools/travis/setup.sh
71
71
install : travis_retry tools/travis/install.sh
Original file line number Diff line number Diff line change 1
1
Allow the new resolver to obtain dependency information through wheels
2
2
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 ``.
Original file line number Diff line number Diff line change @@ -916,7 +916,7 @@ def check_list_path_option(options):
916
916
metavar = 'feature' ,
917
917
action = 'append' ,
918
918
default = [],
919
- choices = ['2020-resolver' , 'lazy-wheel ' ],
919
+ choices = ['2020-resolver' , 'fast-deps ' ],
920
920
help = 'Enable new functionality, that may be backward incompatible.' ,
921
921
) # type: Callable[..., Option]
922
922
Original file line number Diff line number Diff line change @@ -271,7 +271,7 @@ def make_resolver(
271
271
force_reinstall = force_reinstall ,
272
272
upgrade_strategy = upgrade_strategy ,
273
273
py_version_info = py_version_info ,
274
- lazy_wheel = 'lazy-wheel ' in options .features_enabled ,
274
+ lazy_wheel = 'fast-deps ' in options .features_enabled ,
275
275
)
276
276
import pip ._internal .resolution .legacy .resolver
277
277
return pip ._internal .resolution .legacy .resolver .Resolver (
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ def pytest_addoption(parser):
48
48
help = "run the skipped tests for the new resolver" ,
49
49
)
50
50
parser .addoption (
51
- "--lazy-wheel " ,
51
+ "--fast-deps " ,
52
52
action = "store_true" ,
53
53
default = False ,
54
54
help = "use lazy wheels in tests (only affect new resolver)" ,
@@ -114,8 +114,8 @@ def use_new_resolver(request):
114
114
new_resolver = request .config .getoption ("--new-resolver" )
115
115
if not new_resolver :
116
116
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 "
119
119
else :
120
120
os .environ ["PIP_USE_FEATURE" ] = "2020-resolver"
121
121
yield new_resolver
Original file line number Diff line number Diff line change 43
43
RESOLVER_SWITCH=' --new-resolver'
44
44
fi
45
45
46
- if [[ -z " $LAZY_WHEEL " ]]; then
47
- LAZY_WHEEL_SWITCH =' '
46
+ if [[ -z " $FAST_DEPS " ]]; then
47
+ FAST_DEPS_SWITCH =' '
48
48
else
49
- LAZY_WHEEL_SWITCH =' --lazy-wheel '
49
+ FAST_DEPS_SWITCH =' --fast-deps '
50
50
fi
51
51
52
52
# Print the commands run for this test.
@@ -64,7 +64,7 @@ elif [[ "$GROUP" == "2" ]]; then
64
64
elif [[ " $GROUP " == " 3" ]]; then
65
65
# Separate Job for tests that fail with the new resolver
66
66
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
68
68
else
69
69
# Non-Testing Jobs should run once
70
70
tox
You can’t perform that action at this time.
0 commit comments