From bb8a29cfed29f4793fd9c34f0e3c91df8c5fabf8 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 3 Feb 2021 00:21:13 +0100
Subject: [PATCH] Use new issue forms for bug reports

---
 .github/ISSUE_TEMPLATE/bug-report.md  | 36 ------------
 .github/ISSUE_TEMPLATE/bug-report.yml | 85 +++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 36 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug-report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 157be28b678..00000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
----
-
-<!--
-If you're reporting an issue for `--use-feature=2020-resolver`, use the "Dependency resolver failures / errors" template instead.
--->
-
-**Environment**
-
-* pip version:
-* Python version:
-* OS:
-
-<!-- Feel free to add more information about your environment here -->
-
-**Description**
-<!-- A clear and concise description of what the bug is. -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**How to Reproduce**
-<!-- Describe the steps to reproduce this bug. -->
-
-1. Get package from '...'
-2. Then run '...'
-3. An error occurs.
-
-**Output**
-
-```
-Paste the output of the steps above, including the commands themselves and
-pip's output/traceback etc.
-```
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000000..004538bba30
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,85 @@
+---
+name: Bug report
+about: |
+  Create a report to help us improve
+
+  ⚠ If you're reporting an issue for `--use-feature=2020-resolver`, use
+  the "Dependency resolver failures / errors" template instead.
+title: '[Bug]: '
+labels:
+- >-
+  S: needs triage
+- >-
+  type: bug
+issue_body: true  # default: true, adds a classic WSYWIG textarea, if on
+inputs:
+- type: description
+  attributes:
+    value: |
+      **Environment**
+
+      ⚠ If you're reporting an issue for `--use-feature=2020-resolver`,
+      use the "Dependency resolver failures / errors" template instead.
+
+- type: input
+  attributes:
+    label: pip version
+    required: true
+- type: input
+  attributes:
+    label: Python version
+    required: true
+- type: input
+  attributes:
+    label: OS
+    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.
+
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: >-
+      A clear and concise description of what you expected to happen.
+
+- 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.
+
+- 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: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [PSF Code of Conduct][CoC] first.
+
+      [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+    choices:
+    - label: I agree to follow the PSF Code of Conduct
+      required: true
+...