Skip to content

Commit 27b4980

Browse files
committed
Update documentation to reflect updated resolver feature flag
Followup to pypa#8371, pypa#8530, pypa#8513.
1 parent 31299ee commit 27b4980

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Create a report to help us improve
44
---
55

66
<!--
7-
If you're reporting an issue for `--unstable-feature=resolver`, use the "Dependency resolver failures / errors" template instead.
7+
If you're reporting an issue for `--use-feature=2020-resolver`, use the "Dependency resolver failures / errors" template instead.
88
-->
99

1010
**Environment**

docs/html/user_guide.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ specified packages due to conflicting dependencies (a
783783
``ResolutionImpossible`` error).
784784

785785
This documentation is specific to the new resolver, which you can use
786-
with the flag ``--unstable-feature=resolver``.
786+
with the flag ``--use-feature=2020-resolver``.
787787

788788
Understanding your error message
789789
--------------------------------
@@ -1029,13 +1029,13 @@ Changes to the pip dependency resolver in 20.2 (2020)
10291029
=====================================================
10301030

10311031
pip 20.1 included an alpha version of the new resolver (hidden behind
1032-
an optional ``--unstable-feature=resolver`` flag). pip 20.2 includes a
1033-
robust beta of the new resolver (hidden behind an optional
1034-
``--use-feature=2020-resolver`` flag) that we encourage you to
1035-
test. We will continue to improve the pip dependency resolver in
1036-
response to testers' feedback. Please give us feedback through the
1037-
`resolver testing survey`_. This will help us prepare to release pip
1038-
20.3, with the new resolver on by default, in October.
1032+
an optional ``--unstable-feature=resolver`` flag). pip 20.2 removes
1033+
that flag, and includes a robust beta of the new resolver (hidden
1034+
behind an optional ``--use-feature=2020-resolver`` flag) that we
1035+
encourage you to test. We will continue to improve the pip dependency
1036+
resolver in response to testers' feedback. Please give us feedback
1037+
through the `resolver testing survey`_. This will help us prepare to
1038+
release pip 20.3, with the new resolver on by default, in October.
10391039

10401040
Watch out for
10411041
-------------

news/8660.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix feature flag name in docs.

0 commit comments

Comments
 (0)