Merge branch 'main' into main

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -60,15 +60,12 @@ body:
       label: Output
       description: >-
         Provide the output of the steps above, including the commands
-        themselves and pip's output/traceback etc. If you're familiar with
-        Markdown, this block will have triple backticks added automatically
-        around it -- you don't have to add them.
+        themselves and pip's output/traceback etc.
 
-        If you want to present output from multiple commands, please present
-        that as a shell session (commands you run get prefixed with `$ `).
-        Please also ensure that the "How to reproduce" section contains matching
-        instructions for reproducing this.
-      render: sh-session
+        If you want to present output from multiple commands, please prefix
+        the line containing the command with `$ `. Please also ensure that
+        the "How to reproduce" section contains matching instructions for
+        reproducing this.
 
   - type: checkboxes
     attributes:

.github/chronographer.yml

@@ -0,0 +1,30 @@
+---
+
+action-hints:
+  # check-title-prefix: chng  # default: `{{ branch-protection-check-name }}: `
+  external-docs-url: https://pip.pypa.io/how-to-changelog
+  inline-markdown: >
+    Check out https://pip.pypa.io/how-to-changelog
+
+branch-protection-check-name: Timeline protection
+
+enforce-name:
+  # suffix: .md
+  suffix: .rst
+
+exclude:
+  bots:
+  - dependabot-preview
+  - dependabot
+  - patchback
+  humans:
+  - pyup-bot
+
+labels:
+  skip-changelog: skip news
+
+paths:  # relative modified file paths that do or don't need changelog mention
+  exclude: []
+  include: []
+
+...

.github/workflows/ci.yml

@@ -11,14 +11,20 @@ on:
   schedule:
     - cron: 0 0 * * MON # Run every Monday at 00:00 UTC
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   docs:
     name: docs
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
       - run: pip install nox
       - run: nox -s docs
 
@@ -37,31 +43,24 @@ jobs:
               # Anything that's touching "vendored code"
               - "src/pip/_vendor/**"
               - "pyproject.toml"
+              - "noxfile.py"
             tests:
-              # Anything that's touching testable stuff
+              # Anything that's touching code-related stuff
               - ".github/workflows/ci.yml"
               - "src/**"
               - "tests/**"
+              - "noxfile.py"
         if: github.event_name == 'pull_request'
 
-  pre-commit:
-    name: pre-commit
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - uses: pre-commit/action@v2.0.0
-        with:
-          extra_args: --all-files --hook-stage=manual
-
   packaging:
     name: packaging
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
       - name: Set up git credentials
         run: |
           git config --global user.email "pypa-dev@googlegroups.com"
@@ -70,6 +69,7 @@ jobs:
       - run: pip install nox
       - run: nox -s prepare-release -- 99.9
       - run: nox -s build-release -- 99.9
+      - run: pipx run check-manifest
 
   vendoring:
     name: vendoring
@@ -81,18 +81,20 @@ jobs:
       github.event_name != 'pull_request'
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
 
-      - run: pip install vendoring
-      - run: vendoring sync . --verbose
+      - run: pip install nox
+      - run: nox -s vendoring
       - run: git diff --exit-code
 
   tests-unix:
     name: tests / ${{ matrix.python }} / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}-latest
 
-    needs: [pre-commit, packaging, determine-changes]
+    needs: [packaging, determine-changes]
     if: >-
       needs.determine-changes.outputs.tests == 'true' ||
       github.event_name != 'pull_request'
@@ -102,15 +104,15 @@ jobs:
       matrix:
         os: [Ubuntu, MacOS]
         python:
-          - 3.6
-          - 3.7
-          - 3.8
-          - 3.9
-          - "3.10.0-alpha - 3.10"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -120,19 +122,19 @@ jobs:
 
       - name: Install MacOS dependencies
         if: matrix.os == 'MacOS'
-        run: brew install bzr
+        run: brew install breezy
 
-      - run: pip install tox 'virtualenv<20'
+      - run: pip install nox
 
       # Main check
       - name: Run unit tests
         run: >-
-          tox -e py --
+          nox -s test-${{ matrix.python }} --
           -m unit
           --verbose --numprocesses auto --showlocals
       - name: Run integration tests
         run: >-
-          tox -e py --
+          nox -s test-${{ matrix.python }} --
           -m integration
           --verbose --numprocesses auto --showlocals
           --durations=5
@@ -141,7 +143,7 @@ jobs:
     name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group }}
     runs-on: ${{ matrix.os }}-latest
 
-    needs: [pre-commit, packaging, determine-changes]
+    needs: [packaging, determine-changes]
     if: >-
       needs.determine-changes.outputs.tests == 'true' ||
       github.event_name != 'pull_request'
@@ -151,17 +153,17 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - 3.6
+          - "3.7"
           # Commented out, since Windows tests are expensively slow.
-          # - 3.7
-          # - 3.8
-          - 3.9
-          - "3.10.0-alpha - 3.10"
+          # - "3.8"
+          # - "3.9"
+          # - "3.10"
+          - "3.11"
         group: [1, 2]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -180,15 +182,15 @@ jobs:
           $acl.AddAccessRule($rule)
           Set-Acl "R:\Temp" $acl
 
-      - run: pip install tox 'virtualenv<20'
+      - run: pip install nox
         env:
           TEMP: "R:\\Temp"
 
       # Main check
       - name: Run unit tests
         if: matrix.group == 1
         run: >-
-          tox -e py --
+          nox -s test-${{ matrix.python }} --
           -m unit
           --verbose --numprocesses auto --showlocals
         env:
@@ -197,7 +199,7 @@ jobs:
       - name: Run integration tests (group 1)
         if: matrix.group == 1
         run: >-
-          tox -e py --
+          nox -s test-${{ matrix.python }} --
           -m integration -k "not test_install"
           --verbose --numprocesses auto --showlocals
         env:
@@ -206,8 +208,80 @@ jobs:
       - name: Run integration tests (group 2)
         if: matrix.group == 2
         run: >-
-          tox -e py --
+          nox -s test-${{ matrix.python }} --
           -m integration -k "test_install"
           --verbose --numprocesses auto --showlocals
         env:
           TEMP: "R:\\Temp"
+
+  tests-zipapp:
+    name: tests / zipapp
+    runs-on: ubuntu-latest
+
+    needs: [packaging, determine-changes]
+    if: >-
+      needs.determine-changes.outputs.tests == 'true' ||
+      github.event_name != 'pull_request'
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install Ubuntu dependencies
+        run: sudo apt-get install bzr
+
+      - run: pip install nox 'virtualenv<20' 'setuptools != 60.6.0'
+
+      # Main check
+      - name: Run integration tests
+        run: >-
+          nox -s test-3.10 --
+          -m integration
+          --verbose --numprocesses auto --showlocals
+          --durations=5
+          --use-zipapp
+
+  check:  # This job does nothing and is only used for the branch protection
+    if: always()
+
+    needs:
+      - determine-changes
+      - docs
+      - packaging
+      - tests-unix
+      - tests-windows
+      - tests-zipapp
+      - vendoring
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1
+        with:
+          allowed-skips: >-
+            ${{
+              (
+                needs.determine-changes.outputs.vendoring != 'true'
+                && github.event_name == 'pull_request'
+              )
+              && 'vendoring'
+              || ''
+            }}
+            ,
+            ${{
+              (
+                needs.determine-changes.outputs.tests != 'true'
+                && github.event_name == 'pull_request'
+              )
+              && '
+                tests-unix,
+                tests-windows,
+                tests-zipapp,
+                tests-importlib-metadata,
+              '
+              || ''
+            }}
+          jobs: ${{ toJSON(needs) }}

.github/workflows/lock-threads.yml

@@ -14,6 +14,7 @@ concurrency:
 
 jobs:
   action:
+    if: github.repository_owner == 'pypa'
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v3