Merge branch 'main' into unc-path-install

.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

@@ -0,0 +1,79 @@
+name: Bug report
+description: Something is not working correctly.
+labels: "S: needs triage, type: bug"
+
+body:
+  - type: markdown
+    attributes:
+      value: >-
+        Hi there!
+
+        We'd appreciate it if you could search on pip's existing issues prior to filing
+        a bug report.
+
+        We get a lot of duplicate tickets and have limited maintainer capacity to triage
+        them. Thanks!
+
+  - 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: 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: 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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
-# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
-blank_issues_enabled: true  # default
+# Documentation for this file can be found at:
+# https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository
+
+blank_issues_enabled: false
 contact_links:
-- name: 💬 Discourse
-  url: https://discuss.python.org/c/packaging
-  about: |
-    Please ask typical Q&A here: general ideas for Python packaging,
-    questions about structuring projects and so on
-- name: '💬 IRC: #pypa @ Freenode'
-  url: https://webchat.freenode.net/#pypa
-  about: Chat with devs
+  - name: "💬 IRC: #pypa"
+    url: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa
+    about: Chat with devs
+  - name: "(maintainers only) Blank issue"
+    url: https://github.com/pypa/pip/issues/new
+    about: For maintainers only.