summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorSumana Harihareswara <sh@changeset.nyc>2020-12-13 17:50:45 -0500
committerSumana Harihareswara <sh@changeset.nyc>2020-12-13 18:05:42 -0500
commit8acf6d4a3cd150f54d46f45ef26bb178cfda602c (patch)
tree343c598d3fceddb83c8b66c0a451a877a4893210 /README.rst
parentdf7a97f3bc9a7bb0b1bcbcd15419468d05beb442 (diff)
downloadpip-8acf6d4a3cd150f54d46f45ef26bb178cfda602c.tar.gz
docs: Fix README for PyPI rendering
Signed-off-by: Sumana Harihareswara <sh@changeset.nyc>
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst12
1 files changed, 3 insertions, 9 deletions
diff --git a/README.rst b/README.rst
index ef0dd0eca..a15de466b 100644
--- a/README.rst
+++ b/README.rst
@@ -19,16 +19,9 @@ We release updates regularly, with a new version every 3 months. Find more detai
* `Release notes`_
* `Release process`_
-.. warning::
+In pip 20.3, we've `made a big improvement to the heart of pip`_; `learn more`_. We want your input, so `sign up for our user experience research studies`_ to help us do it right.
- In pip 20.3, we've `made a big improvement to the heart of pip`_;
- :ref:`Resolver changes 2020`. We want your input, so `sign up for
- our user experience research studies`_ to help us do it right.
-
-.. warning::
-
- pip 21.0, in January 2021, will remove Python 2 support, per pip's
- :ref:`Python 2 Support` policy. Please migrate to Python 3.
+**Note**: pip 21.0, in January 2021, will remove Python 2 support, per pip's `Python 2 support policy`_. Please migrate to Python 3.
If you find bugs, need help, or want to talk to the developers, please use our mailing lists or chat rooms:
@@ -60,6 +53,7 @@ rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
.. _made a big improvement to the heart of pip: https://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html
.. _learn more: https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020
.. _sign up for our user experience research studies: https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html
+.. _Python 2 support policy: https://pip.pypa.io/en/latest/development/release-process/#python-2-support
.. _Issue tracking: https://github.com/pypa/pip/issues
.. _Discourse channel: https://discuss.python.org/c/packaging
.. _Development mailing list: https://mail.python.org/mailman3/lists/distutils-sig.python.org/