Merge branch 'main' into main

.gitattributes

@@ -1,4 +1,4 @@
 # Patches must have Unix-style line endings, even on Windows
-tools/automation/vendoring/patches/* eol=lf
+tools/vendoring/patches/* eol=lf
 # The CA Bundle should always use Unix-style line endings, even on Windows
 src/pip/_vendor/certifi/*.pem eol=lf

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,81 +1,79 @@
----
 name: Bug report
-about: Something is not working correctly.
-title: ""
+description: Something is not working correctly.
 labels: "S: needs triage, type: bug"
-issue_body: true  # default: true, adds a classic WSYWIG textarea, if on
-body:
-- type: markdown
-  attributes:
-    value: |
-      ⚠
-      If you're reporting an issue for `--use-feature=2020-resolver`,
-      use the "Dependency resolver failures / errors" template instead.
-- type: markdown
-  attributes:
-    value: "**Environment**"
-- type: input
-  attributes:
-    label: pip version
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Python version
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: OS
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Additional information
-    description: >-
-      Feel free to add more information about your environment here.
 
-- type: textarea
-  attributes:
-    label: Description
-    description: >-
-      A clear and concise description of what the bug is.
+body:
+  - type: markdown
+    attributes:
+      value: >-
+        Hi there!
 
-- type: textarea
-  attributes:
-    label: Expected behavior
-    description: >-
-      A clear and concise description of what you expected to happen.
+        We'd appreciate it if you could search on pip's existing issues prior to filing
+        a bug report.
 
-- type: textarea
-  attributes:
-    label: How to Reproduce
-    description: >-
-      Describe the steps to reproduce this bug.
-    value: |
-      1. Get package from '...'
-      2. Then run '...'
-      3. An error occurs.
+        We get a lot of duplicate tickets and have limited maintainer capacity to triage
+        them. Thanks!
 
-- type: textarea
-  attributes:
-    label: Output
-    description: >-
-      Paste the output of the steps above, including the commands
-      themselves and pip's output/traceback etc.
-    value: |
-      ```console
+  - type: textarea
+    attributes:
+      label: Description
+      description: >-
+        A clear and concise description of what the bug is.
+    validations:
+      required: true
 
-      ```
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: >-
+        A clear and concise description of what you expected to happen.
 
-- type: checkboxes
-  attributes:
-    label: Code of Conduct
-    description: |
-      Read the [PSF Code of Conduct][CoC] first.
+  - type: input
+    attributes:
+      label: pip version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Python version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: OS
+    validations:
+      required: true
 
-      [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
-    options:
-    - label: I agree to follow the PSF Code of Conduct
+  - type: textarea
+    attributes:
+      label: How to Reproduce
+      description: Please provide steps to reproduce this bug.
+      placeholder: |
+        1. Get package from '...'
+        2. Then run '...'
+        3. An error occurs.
+    validations:
       required: true
-...
+
+  - type: textarea
+    attributes:
+      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.
+
+        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
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      options:
+        - label: >-
+            I agree to follow the [PSF Code of Conduct](https://www.python.org/psf/conduct/).
+          required: true