Merge remote-tracking branch 'upstream/main' into fix-docs-for-pip-list-outdated-with-freeze-format

Author: Mr-Pepe

.github/chronographer.yml

@@ -0,0 +1,10 @@
+branch-protection-check-name: Changelog entry
+action-hints:
+  check-title-prefix: "Chronographer: "
+  external-docs-url: https://pip.pypa.io/dev/news-entry-failure
+  inline-markdown: >
+    See https://pip.pypa.io/dev/news-entry-failure for details.
+enforce-name:
+  suffix: .rst
+labels:
+  skip-changelog: skip news

.github/workflows/ci.yml

@@ -11,11 +11,6 @@ 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
@@ -26,8 +21,10 @@ jobs:
     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
 
@@ -60,8 +57,10 @@ jobs:
     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 "[email protected]"
@@ -82,8 +81,10 @@ 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 nox
       - run: nox -s vendoring
@@ -103,14 +104,15 @@ jobs:
       matrix:
         os: [Ubuntu, MacOS]
         python:
-          - 3.7
-          - 3.8
-          - 3.9
+          - "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,9 +122,9 @@ jobs:
 
       - name: Install MacOS dependencies
         if: matrix.os == 'MacOS'
-        run: brew install bzr
+        run: brew install breezy
 
-      - run: pip install nox 'virtualenv<20' 'setuptools != 60.6.0'
+      - run: pip install nox
 
       # Main check
       - name: Run unit tests
@@ -151,16 +153,17 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - 3.7
+          - "3.7"
           # Commented out, since Windows tests are expensively slow.
-          # - 3.8
-          # - 3.9
-          - "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 }}
 
@@ -179,7 +182,7 @@ jobs:
           $acl.AddAccessRule($rule)
           Set-Acl "R:\Temp" $acl
 
-      - run: pip install nox 'virtualenv<20'
+      - run: pip install nox
         env:
           TEMP: "R:\\Temp"
 
@@ -221,8 +224,8 @@ 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.10"
 
@@ -240,41 +243,6 @@ jobs:
           --durations=5
           --use-zipapp
 
-  # TODO: Remove this when we add Python 3.11 to CI.
-  tests-importlib-metadata:
-    name: tests for importlib.metadata backend
-    runs-on: ubuntu-latest
-    env:
-      _PIP_USE_IMPORTLIB_METADATA: 'true'
-
-    needs: [packaging, determine-changes]
-    if: >-
-      needs.determine-changes.outputs.tests == 'true' ||
-      github.event_name != 'pull_request'
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.10'
-
-      - name: Install Ubuntu dependencies
-        run: sudo apt-get install bzr
-
-      - run: pip install nox 'virtualenv<20'
-
-      - name: Run unit tests
-        run: >-
-          nox -s test-3.10 --
-          -m unit
-          --verbose --numprocesses auto --showlocals
-      - name: Run integration tests
-        run: >-
-          nox -s test-3.10 --
-          -m integration
-          --verbose --numprocesses auto --showlocals
-          --durations=5
-
   check:  # This job does nothing and is only used for the branch protection
     if: always()
 
@@ -285,7 +253,6 @@ jobs:
       - tests-unix
       - tests-windows
       - tests-zipapp
-      - tests-importlib-metadata
       - vendoring
 
     runs-on: ubuntu-latest

.github/workflows/label-merge-conflicts.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           # `towncrier check` runs `git diff --name-only origin/main...`, which
           # needs a non-shallow clone.

.github/workflows/news-file.yml

@@ -0,0 +1,28 @@
+name: Update documentation redirects
+
+on:
+  push:
+    branches: [main]
+  schedule:
+    - cron: 0 0 * * MON # Run every Monday at 00:00 UTC
+
+env:
+  FORCE_COLOR: "1"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  update-rtd-redirects:
+    runs-on: ubuntu-latest
+    environment: RTD Deploys
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - run: pip install httpx pyyaml rich
+      - run: python tools/update-rtd-redirects.py
+        env:
+          RTD_API_TOKEN: ${{ secrets.RTD_API_TOKEN }}

.github/workflows/update-rtd-redirects.yml

@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -17,23 +17,23 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black
-  rev: 22.6.0
+  rev: 23.1.0
   hooks:
   - id: black
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
+  rev: 6.0.0
   hooks:
   - id: flake8
     additional_dependencies: [
-        'flake8-bugbear==22.3.23',
-        'flake8-logging-format==0.6.0',
-        'flake8-implicit-str-concat==0.3.0',
+        'flake8-bugbear',
+        'flake8-logging-format',
+        'flake8-implicit-str-concat',
     ]
     exclude: tests/data
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.10.1
+  rev: 5.12.0
   hooks:
   - id: isort
     files: \.py$
@@ -47,15 +47,16 @@ repos:
     additional_dependencies: [
         'keyring==23.0.1',
         'nox==2021.6.12',
-        'pytest==7.1.1',
+        'pytest',
         'types-docutils==0.18.3',
         'types-setuptools==57.4.14',
         'types-freezegun==1.1.9',
         'types-six==1.16.15',
+        'types-pyyaml==6.0.12.2',
     ]
 
 - repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.9.0
+  rev: v1.10.0
   hooks:
   - id: python-no-log-warn
   - id: python-no-eval

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+# This file is read by tools/update-rtd-redirects.py.
+# It is related to Read the Docs, but is not a file processed by the platform.
+
+/dev/news-entry-failure: >-
+  https://pip.pypa.io/en/latest/development/contributing/#news-entries
+/errors/resolution-impossible: >-
+  https://pip.pypa.io/en/stable/topics/dependency-resolution/#dealing-with-dependency-conflicts
+/surveys/backtracking: >-
+  https://forms.gle/LkZP95S4CfqBAU1N6
+/warnings/backtracking: >-
+  https://pip.pypa.io/en/stable/topics/dependency-resolution/#possible-ways-to-reduce-backtracking
+/warnings/enable-long-paths: >-
+  https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later
+/warnings/venv: >-
+  https://docs.python.org/3/tutorial/venv.html

.readthedocs-custom-redirects.yml

@@ -1,10 +1,14 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 sphinx:
   builder: htmldir
   configuration: docs/html/conf.py
 
 python:
-  version: 3.8
   install:
     - requirements: docs/requirements.txt