Merge branch 'main' into prefer-conflicting-causes

Author: notatallshaw

.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
@@ -92,7 +97,7 @@ jobs:
 
   tests-unix:
     name: tests / ${{ matrix.python.key || matrix.python }} / ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     needs: [packaging, determine-changes]
     if: >-
@@ -102,14 +107,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [Ubuntu, MacOS]
+        os: [ubuntu-latest, macos-12]
         python:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
 
     steps:
       - uses: actions/checkout@v4
@@ -119,11 +124,13 @@ jobs:
           allow-prereleases: true
 
       - name: Install Ubuntu dependencies
-        if: matrix.os == 'Ubuntu'
-        run: sudo apt-get install bzr
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install bzr
 
       - name: Install MacOS dependencies
-        if: matrix.os == 'MacOS'
+        if: matrix.os == 'macos-12'
         run: brew install breezy
 
       - run: pip install nox
@@ -155,19 +162,22 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - "3.7"
-          # Commented out, since Windows tests are expensively slow.
-          # - "3.8"
+          - "3.8"
+          # Commented out, since Windows tests are expensively slow,
+          # only test the oldest and newest Python supported by pip
           # - "3.9"
           # - "3.10"
-          - "3.11"
+          # - "3.11"
+          - "3.12"  # Comment out when 3.13 is final
+          - "3.13"
         group: [1, 2]
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true
 
       # We use C:\Temp (which is already available on the worker)
       # as a temporary directory for all of the tests because the
@@ -221,9 +231,11 @@ jobs:
           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'
+      - run: pip install nox
 
       # Main check
       - name: Run integration tests

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v4.6.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -17,18 +17,18 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 23.12.1
+  rev: 24.4.0
   hooks:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.2.0
+  rev: v0.4.1
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.8.0
+  rev: v1.9.0
   hooks:
   - id: mypy
     exclude: tests/data
@@ -40,7 +40,6 @@ repos:
         'types-docutils==0.20.0.3',
         'types-setuptools==68.2.0.0',
         'types-freezegun==1.1.10',
-        'types-six==1.16.21.9',
         'types-pyyaml==6.0.12.12',
     ]
 
@@ -54,6 +53,13 @@ repos:
     types: [file]
     exclude: NEWS.rst  # The errors flagged in NEWS.rst are old.
 
+- repo: https://github.com/codespell-project/codespell
+  rev: v2.2.6
+  hooks:
+    - id: codespell
+      exclude: AUTHORS.txt|tests/data
+      args: ["--ignore-words", tools/codespell-ignore.txt]
+
 - repo: local
   hooks:
   - id: news-fragment-filenames

AUTHORS.txt

@@ -9,7 +9,9 @@ Adam Chainz
 Adam Tse
 Adam Wentz
 admin
+Adolfo Ochagavía
 Adrien Morison
+Agus
 ahayrapetyan
 Ahilya
 AinsworthK
@@ -63,8 +65,11 @@ Anudit Nagar
 Anuj Godase
 AQNOUCH Mohammed
 AraHaan
+arena
+arenasys
 Arindam Choudhury
 Armin Ronacher
+Arnon Yaari
 Artem
 Arun Babu Neelicattu
 Ashley Manton
@@ -102,6 +107,7 @@ Brad Erickson
 Bradley Ayers
 Brandon L. Reiss
 Brandt Bucher
+Brannon Dorsey
 Brett Randall
 Brett Rosen
 Brian Cristante
@@ -140,6 +146,7 @@ Christian Oudard
 Christoph Reiter
 Christopher Hunt
 Christopher Snyder
+chrysle
 cjc7373
 Clark Boylan
 Claudio Jolowicz
@@ -157,6 +164,7 @@ Craig Kerstiens
 Cristian Sorinel
 Cristina
 Cristina Muñoz
+ctg123
 Curtis Doty
 cytolentino
 Daan De Meyer
@@ -194,6 +202,7 @@ David Evans
 David Hewitt
 David Linke
 David Poggi
+David Poznik
 David Pursehouse
 David Runge
 David Tucker
@@ -207,6 +216,7 @@ dependabot[bot]
 derwolfe
 Desetude
 Devesh Kumar Singh
+devsagul
 Diego Caraballo
 Diego Ramirez
 DiegoCaraballo
@@ -315,6 +325,7 @@ Ian Stapleton Cordasco
 Ian Wienand
 Igor Kuzmitshov
 Igor Sobreira
+Ikko Ashimine
 Ilan Schnell
 Illia Volochii
 Ilya Baryshev
@@ -364,6 +375,7 @@ Jivan Amara
 Joe Bylund
 Joe Michelini
 John Paton
+John Sirois
 John T. Wodder II
 John-Scott Atlakson
 johnthagen
@@ -408,6 +420,7 @@ Kexuan Sun
 Kit Randel
 Klaas van Schelven
 KOLANICH
+konstin
 kpinc
 Krishna Oza
 Kumar McMillan
@@ -428,6 +441,7 @@ lorddavidiii
 Loren Carvalho
 Lucas Cimon
 Ludovic Gasc
+Luis Medel
 Lukas Geiger
 Lukas Juhrich
 Luke Macken
@@ -441,11 +455,12 @@ Marc Tamlyn
 Marcus Smith
 Mariatta
 Mark Kohler
+Mark McLoughlin
 Mark Williams
 Markus Hametner
 Martey Dodoo
 Martin Fischer
-Martin Häcker
+Martin Häcker
 Martin Pavlasek
 Masaki
 Masklinn
@@ -457,6 +472,7 @@ Matt Bacchi
 Matt Good
 Matt Maker
 Matt Robenolt
+Matt Wozniski
 matthew
 Matthew Einhorn
 Matthew Feickert
@@ -495,7 +511,7 @@ Miro Hrončok
 Monica Baluna
 montefra
 Monty Taylor
-Muha Ajjan‮
+Muha Ajjan
 Nadav Wexler
 Nahuel Ambrosini
 Nate Coraor
@@ -559,7 +575,9 @@ Paweł Szramowski
 Pekka Klärck
 Peter Gessler
 Peter Lisák
+Peter Shen
 Peter Waller
+Petr Viktorin
 petr-tik
 Phaneendra Chiruvella
 Phil Elson
@@ -592,6 +610,7 @@ Quentin Pradet
 R. David Murray
 Rafael Caricio
 Ralf Schmitt
+Ran Benita
 Razzi Abuissa
 rdb
 Reece Dunham
@@ -624,6 +643,7 @@ Russell Keith-Magee
 Ryan Shepherd
 Ryan Wooden
 ryneeverett
+S. Guliaev
 Sachi King
 Salvatore Rinchiera
 sandeepkiran-js
@@ -642,6 +662,7 @@ Seth Michael Larson
 Seth Woodworth
 Shahar Epstein
 Shantanu
+shenxianpeng
 shireenrao
 Shivansh-007
 Shlomi Fish
@@ -741,6 +762,7 @@ Wolfgang Maier
 Wu Zhenyu
 XAMES3
 Xavier Fernandez
+Xianpeng Shen
 xoviat
 xtreak
 YAMAMOTO Takashi
@@ -757,4 +779,3 @@ Zvezdan Petkovic
 Łukasz Langa
 Роман Донченко
 Семён Марьясин
-‮rekcäH nitraM‮

MANIFEST.in

@@ -29,8 +29,6 @@ recursive-include src/pip/_vendor py.typed
 recursive-include docs *.css *.py *.rst *.md
 recursive-include docs *.dot *.png
 
-exclude src/pip/_vendor/six
-exclude src/pip/_vendor/six/moves
 recursive-exclude src/pip/_vendor *.pyi
 
 prune .github