Skip to content

Commit 6d78a64

Browse files
committed
Merge remote-tracking branch 'upstream/main' into rm-search
2 parents 2b33444 + e0c7f24 commit 6d78a64

File tree

314 files changed

+9376
-5376
lines changed

Some content is hidden

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

314 files changed

+9376
-5376
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ contact_links:
66
- name: "💬 IRC: #pypa"
77
url: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa
88
about: Chat with devs
9+
- name: "(maintainers only) Blank issue"
10+
url: https://github.com/pypa/pip/issues/new
11+
about: For maintainers only.

.github/lock.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ on:
1212
- cron: 0 0 * * MON # Run every Monday at 00:00 UTC
1313

1414
jobs:
15+
docs:
16+
name: docs
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
- uses: actions/setup-python@v2
22+
- run: pip install nox
23+
- run: nox -s docs
24+
1525
determine-changes:
1626
runs-on: ubuntu-latest
1727
outputs:
@@ -92,11 +102,10 @@ jobs:
92102
matrix:
93103
os: [Ubuntu, MacOS]
94104
python:
95-
- 3.6
96105
- 3.7
97106
- 3.8
98107
- 3.9
99-
- "3.10.0-alpha - 3.10"
108+
- "3.10"
100109

101110
steps:
102111
- uses: actions/checkout@v2
@@ -141,12 +150,11 @@ jobs:
141150
matrix:
142151
os: [Windows]
143152
python:
144-
- 3.6
153+
- 3.7
145154
# Commented out, since Windows tests are expensively slow.
146-
# - 3.7
147155
# - 3.8
148-
- 3.9
149-
- "3.10.0-alpha - 3.10"
156+
# - 3.9
157+
- "3.10"
150158
group: [1, 2]
151159

152160
steps:

.github/workflows/lock-threads.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 'Lock Closed Threads'
2+
3+
on:
4+
schedule:
5+
- cron: '0 7 * * *' # 7am UTC, daily
6+
workflow_dispatch:
7+
8+
permissions:
9+
issues: write
10+
pull-requests: write
11+
12+
concurrency:
13+
group: lock
14+
15+
jobs:
16+
action:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: dessant/lock-threads@v3
20+
with:
21+
issue-inactive-days: '30'
22+
pr-inactive-days: '15'

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Dongweiming <[email protected]> <[email protected]
1919
2020
Endoh Takanao <[email protected]>
2121
Erik M. Bray <[email protected]>
22+
Ee Durbin <[email protected]>
2223
Gabriel de Perthuis <[email protected]>
2324
Hsiaoming Yang <[email protected]>
2425
Hugo van Kemenade <[email protected]> Hugo <[email protected]>

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ repos:
4747
additional_dependencies: [
4848
'keyring==23.0.1',
4949
'nox==2021.6.12',
50+
'pytest==6.2.5',
5051
'types-docutils==0.1.8',
5152
'types-setuptools==57.0.2',
5253
'types-six==0.1.9',

AUTHORS.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Bastian Venthur
7777
Ben Bodenmiller
7878
Ben Darnell
7979
Ben Hoyt
80+
Ben Mares
8081
Ben Rosser
8182
Bence Nagy
8283
Benjamin Peterson
@@ -148,7 +149,9 @@ Cristina Muñoz
148149
Curtis Doty
149150
cytolentino
150151
Daan De Meyer
152+
Damian
151153
Damian Quiroga
154+
Damian Shaw
152155
Dan Black
153156
Dan Savilonis
154157
Dan Sully
@@ -201,6 +204,7 @@ DrFeathers
201204
Dustin Ingram
202205
Dwayne Bailey
203206
Ed Morley
207+
Ee Durbin
204208
Eitan Adler
205209
ekristina
206210
elainechan
@@ -219,8 +223,6 @@ Eric Hanchrow
219223
Eric Hopper
220224
Erik M. Bray
221225
Erik Rose
222-
Ernest W Durbin III
223-
Ernest W. Durbin III
224226
Erwin Janssen
225227
Eugene Vereshchagin
226228
everdimension
@@ -301,6 +303,7 @@ Jelmer Vernooij
301303
jenix21
302304
Jeremy Stanley
303305
Jeremy Zafran
306+
Jesse Rittner
304307
Jiashuo Li
305308
Jim Fisher
306309
Jim Garrison
@@ -431,7 +434,9 @@ Nicole Harris
431434
Nikhil Benesch
432435
Nikita Chepanov
433436
Nikolay Korolev
437+
Nipunn Koorapati
434438
Nitesh Sharma
439+
Niyas Sait
435440
Noah
436441
Noah Gorny
437442
Nowell Strite
@@ -464,9 +469,11 @@ Paul Nasrat
464469
Paul Oswald
465470
Paul van der Linden
466471
Paulus Schoutsen
472+
Pavel Safronov
467473
Pavithra Eswaramoorthy
468474
Pawel Jasinski
469475
Pekka Klärck
476+
Peter Gessler
470477
Peter Lisák
471478
Peter Waller
472479
petr-tik
@@ -629,6 +636,7 @@ Yu Jian
629636
Yuan Jing Vincent Yan
630637
Zearin
631638
Zhiping Deng
639+
ziebam
632640
Zvezdan Petkovic
633641
Łukasz Langa
634642
Семён Марьясин

NEWS.rst

Lines changed: 96 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,104 @@
77
To add a new change log entry, please see
88
https://pip.pypa.io/en/latest/development/contributing/#news-entries
99
10-
1110
.. towncrier release notes start
1211
12+
21.3.1 (2021-10-22)
13+
===================
14+
15+
16+
Bug Fixes
17+
---------
18+
19+
20+
- Always refuse installing or building projects that have no ``pyproject.toml`` nor
21+
``setup.py``. (`#10531 <https://github.com/pypa/pip/issues/10531>`_)
22+
- Tweak running-as-root detection, to check ``os.getuid`` if it exists, on Unix-y and non-Linux/non-MacOS machines. (`#10565 <https://github.com/pypa/pip/issues/10565>`_)
23+
- When installing projects with a ``pyproject.toml`` in editable mode, and the build
24+
backend does not support :pep:`660`, prepare metadata using
25+
``prepare_metadata_for_build_wheel`` instead of ``setup.py egg_info``. Also, refuse
26+
installing projects that only have a ``setup.cfg`` and no ``setup.py`` nor
27+
``pyproject.toml``. These restore the pre-21.3 behaviour. (`#10573 <https://github.com/pypa/pip/issues/10573>`_)
28+
- Restore compatibility of where configuration files are loaded from on MacOS (back to ``Library/Application Support/pip``, instead of ``Preferences/pip``). (`#10585 <https://github.com/pypa/pip/issues/10585>`_)
29+
30+
Vendored Libraries
31+
------------------
32+
33+
34+
- Upgrade pep517 to 0.12.0
35+
36+
37+
21.3 (2021-10-11)
38+
=================
39+
40+
Deprecations and Removals
41+
-------------------------
42+
43+
- Improve deprecation warning regarding the copying of source trees when installing from a local directory. (`#10128 <https://github.com/pypa/pip/issues/10128>`_)
44+
- Suppress location mismatch warnings when pip is invoked from a Python source
45+
tree, so ``ensurepip`` does not emit warnings on CPython ``make install``. (`#10270 <https://github.com/pypa/pip/issues/10270>`_)
46+
- On Python 3.10 or later, the installation scheme backend has been changed to use
47+
``sysconfig``. This is to anticipate the deprecation of ``distutils`` in Python
48+
3.10, and its scheduled removal in 3.12. For compatibility considerations, pip
49+
installations running on Python 3.9 or lower will continue to use ``distutils``. (`#10358 <https://github.com/pypa/pip/issues/10358>`_)
50+
- Remove the ``--build-dir`` option and aliases, one last time. (`#10485 <https://github.com/pypa/pip/issues/10485>`_)
51+
- In-tree builds are now the default. ``--use-feature=in-tree-build`` is now
52+
ignored. ``--use-deprecated=out-of-tree-build`` may be used temporarily to ease
53+
the transition. (`#10495 <https://github.com/pypa/pip/issues/10495>`_)
54+
- Un-deprecate source distribution re-installation behaviour. (`#8711 <https://github.com/pypa/pip/issues/8711>`_)
55+
56+
Features
57+
--------
58+
59+
- Replace vendored appdirs with platformdirs. (`#10202 <https://github.com/pypa/pip/issues/10202>`_)
60+
- Support `PEP 610 <https://www.python.org/dev/peps/pep-0610/>`_ to detect
61+
editable installs in ``pip freeze`` and ``pip list``. The ``pip list`` column output
62+
has a new ``Editable project location`` column, and the JSON output has a new
63+
``editable_project_location`` field. (`#10249 <https://github.com/pypa/pip/issues/10249>`_)
64+
- ``pip freeze`` will now always fallback to reporting the editable project
65+
location when it encounters a VCS error while analyzing an editable
66+
requirement. Before, it sometimes reported the requirement as non-editable. (`#10410 <https://github.com/pypa/pip/issues/10410>`_)
67+
- ``pip show`` now sorts ``Requires`` and ``Required-By`` alphabetically. (`#10422 <https://github.com/pypa/pip/issues/10422>`_)
68+
- Do not raise error when there are no files to remove with ``pip cache purge/remove``.
69+
Instead log a warning and continue (to log that we removed 0 files). (`#10459 <https://github.com/pypa/pip/issues/10459>`_)
70+
- When backtracking during dependency resolution, prefer the dependencies which are involved in the most recent conflict. This can significantly reduce the amount of backtracking required. (`#10479 <https://github.com/pypa/pip/issues/10479>`_)
71+
- Cache requirement objects, to improve performance reducing reparses of requirement strings. (`#10550 <https://github.com/pypa/pip/issues/10550>`_)
72+
- Support editable installs for projects that have a ``pyproject.toml`` and use a
73+
build backend that supports :pep:`660`. (`#8212 <https://github.com/pypa/pip/issues/8212>`_)
74+
- When a revision is specified in a Git URL, use git's partial clone feature to speed up source retrieval. (`#9086 <https://github.com/pypa/pip/issues/9086>`_)
75+
- Add a ``--debug`` flag, to enable a mode that doesn't log errors and propagates them to the top level instead. This is primarily to aid with debugging pip's crashes. (`#9349 <https://github.com/pypa/pip/issues/9349>`_)
76+
- If a host is explicitly specified as trusted by the user (via the --trusted-host option), cache HTTP responses from it in addition to HTTPS ones. (`#9498 <https://github.com/pypa/pip/issues/9498>`_)
77+
78+
Bug Fixes
79+
---------
80+
81+
- Present a better error message, when a ``file:`` URL is not found. (`#10263 <https://github.com/pypa/pip/issues/10263>`_)
82+
- Fix the auth credential cache to allow for the case in which
83+
the index url contains the username, but the password comes
84+
from an external source, such as keyring. (`#10269 <https://github.com/pypa/pip/issues/10269>`_)
85+
- Fix double unescape of HTML ``data-requires-python`` and ``data-yanked`` attributes. (`#10378 <https://github.com/pypa/pip/issues/10378>`_)
86+
- New resolver: Fixes depth ordering of packages during resolution, e.g. a dependency 2 levels deep will be ordered before a dependency 3 levels deep. (`#10482 <https://github.com/pypa/pip/issues/10482>`_)
87+
- Correctly indent metadata preparation messages in pip output. (`#10524 <https://github.com/pypa/pip/issues/10524>`_)
88+
89+
Vendored Libraries
90+
------------------
91+
92+
- Remove appdirs as a vendored dependency.
93+
- Upgrade distlib to 0.3.3
94+
- Upgrade distro to 1.6.0
95+
- Patch pkg_resources to use platformdirs rather than appdirs.
96+
- Add platformdirs as a vendored dependency.
97+
- Upgrade progress to 1.6
98+
- Upgrade resolvelib to 0.8.0
99+
- Upgrade urllib3 to 1.26.7
100+
101+
Improved Documentation
102+
----------------------
103+
104+
- Update links of setuptools as setuptools moved these documents. The Simple Repository link now points to PyPUG as that is the canonical place of packaging specification, and setuptools's ``easy_install`` is deprecated. (`#10430 <https://github.com/pypa/pip/issues/10430>`_)
105+
- Create a "Build System Interface" reference section, for documenting how pip interacts with build systems. (`#10497 <https://github.com/pypa/pip/issues/10497>`_)
106+
107+
13108
21.2.4 (2021-08-12)
14109
===================
15110

0 commit comments

Comments
 (0)