Skip to content

Commit

Permalink
Fix misplaced blockquotes
Browse files Browse the repository at this point in the history
Signed-off-by: Pradyun Gedam <pradyunsg@users.noreply.github.com>
  • Loading branch information
pradyunsg committed Nov 12, 2020
1 parent 6962284 commit 321163f
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 44 deletions.
24 changes: 12 additions & 12 deletions docs/html/development/architecture/upgrade-options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ relevant if ``--upgrade`` is specified. The base behaviour is to allow
packages specified on pip's command line to be upgraded. This option controls
what *other* packages can be upgraded:

* ``eager`` - all packages will be upgraded to the latest possible version.
It should be noted here that pip's current resolution algorithm isn't even
aware of packages other than those specified on the command line, and
those identified as dependencies. This may or may not be true of the new
resolver.
* ``only-if-needed`` - packages are only upgraded if they are named in the
pip command or a requirement file (i.e, they are direct requirements), or
an upgraded parent needs a later version of the dependency than is
currently installed.
* ``to-satisfy-only`` (**undocumented**) - packages are not upgraded (not
even direct requirements) unless the currently installed version fails to
satisfy a requirement (either explicitly specified or a dependency).
* ``eager`` - all packages will be upgraded to the latest possible version.
It should be noted here that pip's current resolution algorithm isn't even
aware of packages other than those specified on the command line, and
those identified as dependencies. This may or may not be true of the new
resolver.
* ``only-if-needed`` - packages are only upgraded if they are named in the
pip command or a requirement file (i.e, they are direct requirements), or
an upgraded parent needs a later version of the dependency than is
currently installed.
* ``to-satisfy-only`` (**undocumented**) - packages are not upgraded (not
even direct requirements) unless the currently installed version fails to
satisfy a requirement (either explicitly specified or a dependency).

``--force-reinstall``

Expand Down
30 changes: 15 additions & 15 deletions docs/html/development/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ Supported interpreters

pip support a variety of Python interpreters:

- CPython 2.7
- CPython 3.5
- CPython 3.6
- CPython 3.7
- CPython 3.8
- Latest PyPy
- Latest PyPy3
- CPython 2.7
- CPython 3.5
- CPython 3.6
- CPython 3.7
- CPython 3.8
- Latest PyPy
- Latest PyPy3

on different operating systems:

- Linux
- Windows
- MacOS
- Linux
- Windows
- MacOS

and on different architectures:

- x64
- x86
- x64
- x86

so 42 hypothetical interpreters.

Expand Down Expand Up @@ -66,9 +66,9 @@ Services
pip test suite and checks are distributed on three different platforms that
provides free executors for open source packages:

- `GitHub Actions`_ (Used for code quality and development tasks)
- `Azure DevOps CI`_ (Used for tests)
- `Travis CI`_ (Used for PyPy tests)
- `GitHub Actions`_ (Used for code quality and development tasks)
- `Azure DevOps CI`_ (Used for tests)
- `Travis CI`_ (Used for PyPy tests)

.. _`Travis CI`: https://travis-ci.org/
.. _`Azure DevOps CI`: https://azure.microsoft.com/en-us/services/devops/
Expand Down
6 changes: 3 additions & 3 deletions docs/html/development/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ in order to start contributing.
* A guide on `triaging issues`_ for issue tracker
* Getting started with Git

- `Hello World for Git`_
- `Understanding the GitHub flow`_
- `Start using Git on the command line`_
- `Hello World for Git`_
- `Understanding the GitHub flow`_
- `Start using Git on the command line`_


.. _`open an issue`: https://github.com/pypa/pip/issues/new?title=Trouble+with+pip+development+environment
Expand Down
26 changes: 13 additions & 13 deletions docs/html/development/issue-triage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,16 @@ An issue may be considered resolved and closed when:
- for each possible improvement or problem represented in the issue
discussion:

- Consensus has been reached on a specific action and the actions
appear to be external to the project, with no follow up needed
in the project afterwards.
- Consensus has been reached on a specific action and the actions
appear to be external to the project, with no follow up needed
in the project afterwards.

- PEP updates (with a corresponding issue in
`python/peps <https://github.com/python/peps>`__)
- already tracked by another issue
- PEP updates (with a corresponding issue in
`python/peps <https://github.com/python/peps>`__)
- already tracked by another issue

- A project-specific issue has been identified and the issue no
longer occurs as of the latest commit on the master branch.
- A project-specific issue has been identified and the issue no
longer occurs as of the latest commit on the master branch.

- An enhancement or feature request no longer has a proponent and the maintainers
don't think it's worth keeping open.
Expand All @@ -305,8 +305,8 @@ Common issues
manager-managed pip/python installation (specifically with Debian/Ubuntu).
These typically present themselves as:

#. Not being able to find installed packages
#. basic libraries not able to be found, fundamental OS components missing
#. In these situations you will want to make sure that we know how they got
their Python and pip. Knowing the relevant package manager commands can
help, e.g. ``dpkg -S``.
#. Not being able to find installed packages
#. basic libraries not able to be found, fundamental OS components missing
#. In these situations you will want to make sure that we know how they got
their Python and pip. Knowing the relevant package manager commands can
help, e.g. ``dpkg -S``.
2 changes: 1 addition & 1 deletion docs/pip_sphinxext.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def process_options(self):
prefix = '{}_'.format(self.determine_opt_prefix(opt_name))

self.view_list.append(
' * :ref:`{short}{long}<{prefix}{opt_name}>`'.format(
'* :ref:`{short}{long}<{prefix}{opt_name}>`'.format(
short=short_opt_name,
long=opt_name,
prefix=prefix,
Expand Down

0 comments on commit 321163f

Please sign in to comment.