Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update documentation to reflect updated resolver feature flag #8660

Merged
merged 1 commit into from
Jul 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about: Create a report to help us improve
---

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

**Environment**
Expand Down
16 changes: 8 additions & 8 deletions docs/html/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ specified packages due to conflicting dependencies (a
``ResolutionImpossible`` error).

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

Understanding your error message
--------------------------------
Expand Down Expand Up @@ -1029,13 +1029,13 @@ Changes to the pip dependency resolver in 20.2 (2020)
=====================================================

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

Watch out for
-------------
Expand Down
1 change: 1 addition & 0 deletions news/8660.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix feature flag name in docs.