Merge branch 'main' into errors/uninstall

pypa · Mar 8, 2024 · 65589e9 · 65589e9
2 parents ba43668 + 0235025
commit 65589e9
Show file tree

Hide file tree

Showing 98 changed files with 1,358 additions and 876 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,11 @@ on:
   schedule:
     - cron: 0 0 * * MON # Run every Monday at 00:00 UTC
 
+env:
+  # The "FORCE_COLOR" variable, when set to 1,
+  # tells Nox to colorize itself.
+  FORCE_COLOR: "1"
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
@@ -22,7 +27,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - run: pip install nox
@@ -58,7 +63,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Set up git credentials
@@ -82,7 +87,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 
@@ -104,7 +109,6 @@ jobs:
       matrix:
         os: [Ubuntu, MacOS]
         python:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
@@ -113,14 +117,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
 
       - name: Install Ubuntu dependencies
         if: matrix.os == 'Ubuntu'
-        run: sudo apt-get install bzr
+        run: |
+          sudo apt-get update
+          sudo apt-get install bzr
 
       - name: Install MacOS dependencies
         if: matrix.os == 'MacOS'
@@ -155,17 +161,16 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - "3.7"
+          - "3.8"
           # Commented out, since Windows tests are expensively slow.
-          # - "3.8"
           # - "3.9"
           # - "3.10"
           - "3.11"
         group: [1, 2]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
@@ -216,12 +221,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
       - name: Install Ubuntu dependencies
-        run: sudo apt-get install bzr
+        run: |
+          sudo apt-get update
+          sudo apt-get install bzr
 
       - run: pip install nox 'virtualenv<20' 'setuptools != 60.6.0'
 

diff --git a/.github/workflows/update-rtd-redirects.yml b/.github/workflows/update-rtd-redirects.yml
@@ -19,7 +19,7 @@ jobs:
     environment: RTD Deploys
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - run: pip install httpx pyyaml rich

diff --git a/.mailmap b/.mailmap
@@ -27,6 +27,7 @@ Hugo van Kemenade   <hugovk@users.noreply.github.com>   hugovk <hugovk@users.nor
 Igor Kuzmitshov     <kuzmiigo@gmail.com>                    <igor@qubit.com>
 Ilya Baryshev                                               <baryshev@gmail.com>
 Jakub Stasiak                                               <kuba.stasiak@gmail.com>
+Jean Abou Samra                                             <jean@abou-samra.fr>
 John-Scott Atlakson                                         <john.scott.atlakson@gmail.com>
 Jorge Niedbalski                                            <niedbalski@gmail.com>
                     <niedbalski@gmail.com>                  <jorge@nimbic.com>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -16,19 +16,19 @@ repos:
   - id: trailing-whitespace
     exclude: .patch
 
-- repo: https://github.com/psf/black
-  rev: 23.7.0
+- repo: https://github.com/psf/black-pre-commit-mirror
+  rev: 23.12.1
   hooks:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.4
+  rev: v0.2.0
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.6.1
+  rev: v1.8.0
   hooks:
   - id: mypy
     exclude: tests/data

diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -160,6 +160,7 @@ Cristina Muñoz
 Curtis Doty
 cytolentino
 Daan De Meyer
+Dale
 Damian
 Damian Quiroga
 Damian Shaw
@@ -226,6 +227,7 @@ Dustin Ingram
 Dwayne Bailey
 Ed Morley
 Edgar Ramírez
+Edgar Ramírez Mondragón
 Ee Durbin
 Efflam Lemaillet
 efflamlemaillet
@@ -258,6 +260,7 @@ Filip Kokosiński
 Filipe Laíns
 Finn Womack
 finnagin
+Flavio Amurrio
 Florian Briand
 Florian Rathgeber
 Francesco
@@ -320,6 +323,7 @@ Ionel Cristian Mărieș
 Ionel Maries Cristian
 Itamar Turner-Trauring
 Ivan Pozdeev
+J. Nick Koston
 Jacob Kim
 Jacob Walls
 Jaime Sanz
@@ -342,6 +346,7 @@ Jason R. Coombs
 JasonMo
 JasonMo1
 Jay Graves
+Jean Abou Samra
 Jean-Christophe Fillion-Robin
 Jeff Barber
 Jeff Dairiki
@@ -581,6 +586,7 @@ Przemek Wrzos
 Pulkit Goyal
 q0w
 Qiangning Hong
+Qiming Xu
 Quentin Lee
 Quentin Pradet
 R. David Murray
@@ -719,6 +725,7 @@ Vincent Philippon
 Vinicyus Macedo
 Vipul Kumar
 Vitaly Babiy
+Vladimir Fokow
 Vladimir Rutsky
 W. Trevor King
 Wil Tan

diff --git a/NEWS.rst b/NEWS.rst
@@ -9,6 +9,46 @@
 
 .. towncrier release notes start
 
+24.0 (2024-02-03)
+=================
+
+Features
+--------
+
+- Retry on HTTP status code 502 (`#11843 <https://github.com/pypa/pip/issues/11843>`_)
+- Automatically use the setuptools PEP 517 build backend when ``--config-settings`` is
+  used for projects without ``pyproject.toml``. (`#11915 <https://github.com/pypa/pip/issues/11915>`_)
+- Make pip freeze and pip uninstall of legacy editable installs of packages whose name
+  contains ``_`` compatible with ``setuptools>=69.0.3``. (`#12477 <https://github.com/pypa/pip/issues/12477>`_)
+- Support per requirement ``--config-settings`` for editable installs. (`#12480 <https://github.com/pypa/pip/issues/12480>`_)
+
+Bug Fixes
+---------
+
+- Optimized usage of ``--find-links=<path-to-dir>``, by only scanning the relevant directory once, only considering file names that are valid wheel or sdist names, and only considering files in the directory that are related to the install. (`#12327 <https://github.com/pypa/pip/issues/12327>`_)
+- Removed ``wheel`` from the ``[build-system].requires`` list fallback
+  that is used when ``pyproject.toml`` is absent. (`#12449 <https://github.com/pypa/pip/issues/12449>`_)
+
+Vendored Libraries
+------------------
+
+- Upgrade distlib to 0.3.8
+
+Improved Documentation
+----------------------
+
+- Fix explanation of how PIP_CONFIG_FILE works (`#11815 <https://github.com/pypa/pip/issues/11815>`_)
+- Fix outdated pip install argument description in documentation. (`#12417 <https://github.com/pypa/pip/issues/12417>`_)
+- Replace some links to PEPs with links to the canonical specifications on the :doc:`pypug:index` (`#12434 <https://github.com/pypa/pip/issues/12434>`_)
+- Updated the ``pyproject.toml`` document to stop suggesting
+  to depend on ``wheel`` as a build dependency directly. (`#12449 <https://github.com/pypa/pip/issues/12449>`_)
+- Update supported interpreters in development docs (`#12475 <https://github.com/pypa/pip/issues/12475>`_)
+
+Process
+-------
+
+- Most project metadata is now defined statically via pip's ``pyproject.toml`` file.
+
 23.3.2 (2023-12-17)
 ===================
 

diff --git a/docs/html/development/architecture/anatomy.rst b/docs/html/development/architecture/anatomy.rst
@@ -14,16 +14,14 @@ Repository anatomy & directory structure
 Root and tools
 ==============
 
-The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the top level.
+The ``README``, license, ``pyproject.toml``, and so on are in the top level.
 
 * ``AUTHORS.txt``
 * ``LICENSE.txt``
 * ``MANIFEST.in``
 * ``NEWS.rst``
 * ``pyproject.toml``
 * ``README.rst``
-* ``setup.cfg``
-* ``setup.py``
 * ``noxfile.py`` -- ``pip`` uses Nox, an automation tool, configured by this file. ``noxfile.py`` describes a few environments ``pip`` uses during development for simplifying how tests are run (complicated situation there). Example: ``nox -s lint``, ``nox -s test-3.10``. We can run tests for different versions of Python by changing “3.10” to “3.7” or similar.
 * ``.gitattributes``
 * ``.gitignore``

diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
@@ -18,10 +18,11 @@ Supported interpreters
 
 pip support a variety of Python interpreters:
 
-- CPython 3.7
 - CPython 3.8
 - CPython 3.9
 - CPython 3.10
+- CPython 3.11
+- CPython 3.12
 - Latest PyPy3
 
 on different operating systems:
@@ -88,61 +89,75 @@ Actual testing
 +------------------------------+---------------+-----------------+
 |       **interpreter**        |   **unit**    | **integration** |
 +-----------+----------+-------+---------------+-----------------+
-|           |   x86    | CP3.7 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |               |                 |
+|           |   x86    | CP3.8 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.11|               |                 |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |  Windows  +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.7 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |               |                 |
+|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.10|   GitHub      |   GitHub        |
+|           |          | CP3.10|               |                 |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.11|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |   x86    | CP3.7 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |               |                 |
+|           |   x86    | CP3.8 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.10|               |                 |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.11|               |                 |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.7 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |   GitHub      |   GitHub        |
+|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.11|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |  arm64   | CP3.7 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |               |                 |
+|           |  arm64   | CP3.8 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.11|               |                 |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.12|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   macOS   +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.7 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |   GitHub      |   GitHub        |
+|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.11|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+