Skip to content

Commit b974673

Browse files
uranusjruranusjr
committed
Merge branch 'main' into release/21.2.3
2 parents 2c55d2b + 0b95378 commit b974673

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1048
-942
lines changed

‎.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
tests:
3131
# Anything that's touching testable stuff
3232
- ".github/workflows/ci.yml"
33-
- "tools/requirements/tests.txt"
3433
- "src/**"
3534
- "tests/**"
3635
if: github.event_name == 'pull_request'

‎.pre-commit-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ repos:
2222
- id: black
2323
exclude: |
2424
(?x)
25-
^src/pip/_internal/commands|
2625
^src/pip/_internal/index|
2726
^src/pip/_internal/models|
2827
^src/pip/_internal/operations|
29-
^src/pip/_internal/req|
3028
^src/pip/_internal/vcs|
3129
^src/pip/_internal/\w+\.py$|
3230
# Tests

‎.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ sphinx:
77
python:
88
version: 3.8
99
install:
10-
- requirements: tools/requirements/docs.txt
10+
- requirements: docs/requirements.txt

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ recursive-include src/pip/_vendor *LICENSE*
1010
recursive-include src/pip/_vendor *COPYING*
1111

1212
include docs/docutils.conf
13+
include docs/requirements.txt
1314

1415
exclude .coveragerc
1516
exclude .mailmap

‎docs/html/cli/pip.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ verbosity log will be kept. This option is empty by default. This log appends
4747
to previous logging.
4848

4949
Like all pip options, ``--log`` can also be set as an environment variable, or
50-
placed into the pip config file. See the :ref:`Configuration` section.
50+
placed into the pip config file. See the :doc:`topics/configuration` section.
5151

5252
.. _`exists-action`:
5353

‎docs/html/development/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
Configuration
55
=============
66

7-
This content is now covered in the :ref:`Configuration` section of the :doc:`User Guide </user_guide>`.
7+
This content is now covered in the :doc:`topics/configuration` section of the :doc:`User Guide </user_guide>`.

‎tools/requirements/docs.txt renamed to ‎docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sphinx == 3.2.1
1+
sphinx ~= 4.1.0
22
towncrier
33
furo
44
myst_parser

‎news/10128.removal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve deprecation warning regarding the copying of source trees when installing from a local directory.

‎news/10165.trivial.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Add a ``feature_flag`` optional kwarg to the ``deprecated()`` function
2+
``pip._internal.utils.deprecation:deprecated``. Also formulate a corresponding canned
3+
message which suggests using the ``--use-feature={feature_flag}`` to test upcoming
4+
behavior.

‎news/10233.bugfix.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
New resolver: When a package is specified with extras in constraints, and with
2+
extras in non-constraint requirements, the resolver now correctly identifies the
3+
constraint's existence and avoids backtracking.

0 commit comments

Comments
 (0)