Merge branch 'master' into add-show-json-docs

Author: deveshks

.azure-pipelines/jobs/test-windows.yml

@@ -9,14 +9,8 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      "2.7-x86":
-        python.version: '2.7'
-        python.architecture: x86
-      "2.7":  # because Python 2!
-        python.version: '2.7'
-        python.architecture: x64
-      "3.5":  # lowest Py3 version
-        python.version: '3.5'
+      "3.6":  # lowest Python version
+        python.version: '3.6'
         python.architecture: x64
       "3.8":  # current
         python.version: '3.8'
@@ -38,16 +32,10 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      "3.6":
-        python.version: '3.6'
-        python.architecture: x64
       "3.7":
         python.version: '3.7'
         python.architecture: x64
       # This is for Windows, so test x86 builds
-      "3.5-x86":
-        python.version: '3.5'
-        python.architecture: x86
       "3.6-x86":
         python.version: '3.6'
         python.architecture: x86

.azure-pipelines/jobs/test.yml

@@ -9,8 +9,8 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      "2.7":
-        python.version: '2.7'
+      "3.6":  # lowest Python version
+        python.version: '3.6'
         python.architecture: x64
       "3.8":
         python.version: '3.8'
@@ -29,12 +29,6 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      "3.5":
-        python.version: '3.5'
-        python.architecture: x64
-      "3.6":
-        python.version: '3.6'
-        python.architecture: x64
       "3.7":
         python.version: '3.7'
         python.architecture: x64

.azure-pipelines/linux.yml

@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test.yml
   parameters:

.azure-pipelines/macos.yml

@@ -43,7 +43,7 @@ steps:
       # https://bugs.python.org/issue18199
       $env:TEMP = "R:\Temp"
 
-      tox -e py -- -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
+      tox -e py -- -m integration -n auto --durations=5 --junit-xml=junit/integration-test.xml
     displayName: Tox run integration tests
 
 - task: PublishTestResults@2

.azure-pipelines/steps/run-tests-windows.yml

@@ -11,10 +11,10 @@ steps:
   displayName: Tox run unit tests
 
 # Run integration tests in two groups so we will fail faster if there is a failure in the first group
-- script: tox -e py -- -m integration -n auto --duration=5 -k "not test_install" --junit-xml=junit/integration-test-group0.xml
+- script: tox -e py -- -m integration -n auto --durations=5 -k "not test_install" --junit-xml=junit/integration-test-group0.xml
   displayName: Tox run Group 0 integration tests
 
-- script: tox -e py -- -m integration -n auto --duration=5 -k "test_install" --junit-xml=junit/integration-test-group1.xml
+- script: tox -e py -- -m integration -n auto --durations=5 -k "test_install" --junit-xml=junit/integration-test-group1.xml
   displayName: Tox run Group 1 integration tests
 
 - task: PublishTestResults@2

.azure-pipelines/steps/run-tests.yml

@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test-windows.yml
   parameters:

.azure-pipelines/windows.yml

@@ -0,0 +1,81 @@
+---
+name: Bug report
+about: Something is not working correctly.
+title: ""
+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.
+
+- 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
+    options:
+    - label: I agree to follow the PSF Code of Conduct
+      required: true
+...

.coveragerc

@@ -1,14 +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
 contact_links:
-- name: 🤷💻🤦 Discourse
+- 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: 📝 PyPA Code of Conduct
-  url: https://www.pypa.io/en/latest/code-of-conduct/
-  about: ❤ Be nice to other members of the community. ☮ Behave.

.github/ISSUE_TEMPLATE/bug-report.md

@@ -5,16 +5,30 @@ labels: ["K: UX", "K: crash", "C: new resolver", "C: dependency resolution"]
 ---
 
 <!--
-  Please provide as much information as you can about your failure, so that we can understand the root cause.
+Please provide as much information as you can about your failure, so that we can understand the root cause.
 
-  For example, if you are installing packages from pypi.org, we'd like to see:
+Try if your issue has been fixed in the in-development version of pip. Use the following command to install pip from master:
 
-  - Your terminal output
-  - Any inputs to pip, for example:
-    - any package requirements: any CLI arguments and/or your requirements.txt file
-    - any already installed packages, outputted via `pip freeze`
+    python -m pip install -U "pip @ https://github.com/pypa/pip/archive/master.zip"
+-->
+
+**What did you want to do?**
+<!-- Include any inputs you gave to pip, for example:
+
+* Package requirements: any CLI arguments and/or your requirements.txt file
+* Already installed packages, outputted via `pip freeze`
+-->
 
-  It would be great if you could also include your dependency tree. For this you can use pipdeptree: https://pypi.org/project/pipdeptree/
+**Output**
+
+```
+Paste what pip outputted in a code block. https://github.github.com/gfm/#fenced-code-blocks
+```
+
+**Additional information**
+
+<!--
+It would be great if you could also include your dependency tree. For this you can use pipdeptree: https://pypi.org/project/pipdeptree/
 
-  For users installing packages from a private repository or local directory, please try your best to describe your setup. We'd like to understand how to reproduce the error locally, so would need (at a minimum) a description of the packages you are trying to install, and a list of dependencies for each package.
+For users installing packages from a private repository or local directory, please try your best to describe your setup. We'd like to understand how to reproduce the error locally, so would need (at a minimum) a description of the packages you are trying to install, and a list of dependencies for each package.
 -->

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -19,14 +19,13 @@ jobs:
         os:
         - Ubuntu
         - Windows
-        - MacOS
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     # Setup Caching
     - name: pip cache
@@ -39,7 +38,7 @@ jobs:
           ${{ runner.os }}-
 
     - name: Set PY (for pre-commit cache)
-      run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
+      run: echo "PY=$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" >> $GITHUB_ENV
     - name: pre-commit cache
       uses: actions/cache@v1
       with: