Merge branch 'master' into add-show-json

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

@@ -12,19 +12,13 @@ jobs:
       "2.7-x86":
         python.version: '2.7'
         python.architecture: x86
-      "2.7":
+      "2.7":  # because Python 2!
         python.version: '2.7'
         python.architecture: x64
-      "3.5":
+      "3.5":  # lowest Py3 version
         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
-      "3.8":
+      "3.8":  # current
         python.version: '3.8'
         python.architecture: x64
     maxParallel: 6
@@ -44,6 +38,12 @@ 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'

.azure-pipelines/jobs/test.yml

@@ -12,8 +12,8 @@ jobs:
       "2.7":
         python.version: '2.7'
         python.architecture: x64
-      "3.6":
-        python.version: '3.6'
+      "3.8":
+        python.version: '3.8'
         python.architecture: x64
     maxParallel: 2
 
@@ -32,12 +32,12 @@ jobs:
       "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
-      "3.8":
-        python.version: '3.8'
-        python.architecture: x64
     maxParallel: 4
 
   steps:

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     exclude: .patch
 
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.7.9
+  rev: 3.8.1
   hooks:
   - id: flake8
     exclude: tests/data
@@ -29,7 +29,7 @@ repos:
     files: \.py$
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.760
+  rev: v0.770
   hooks:
   - id: mypy
     exclude: docs|tests

.travis.yml

@@ -19,13 +19,6 @@ jobs:
       env: TOXENV=docs
     - env: TOXENV=lint
     - env: TOXENV=vendoring
-    # Latest CPython
-    - env: GROUP=1
-      python: 2.7
-    - env: GROUP=2
-      python: 2.7
-    - env: GROUP=1
-    - env: GROUP=2
 
     # Complete checking for ensuring compatibility
     # PyPy
@@ -38,19 +31,6 @@ jobs:
       python: pypy2.7-7.1.1
     - env: GROUP=2
       python: pypy2.7-7.1.1
-    # Other Supported CPython
-    - env: GROUP=1
-      python: 3.7
-    - env: GROUP=2
-      python: 3.7
-    - env: GROUP=1
-      python: 3.6
-    - env: GROUP=2
-      python: 3.6
-    - env: GROUP=1
-      python: 3.5
-    - env: GROUP=2
-      python: 3.5
 
     # Test experimental stuff that are not part of the standard pip usage.
     # Helpful for developers working on them to see how they're doing.
@@ -61,6 +41,9 @@ jobs:
     - env:
       - GROUP=2
       - NEW_RESOLVER=1
+    - env:
+      - GROUP=3
+      - NEW_RESOLVER=1
 
   fast_finish: true
   allow_failures:

AUTHORS.txt

@@ -380,6 +380,7 @@ Nick Coghlan
 Nick Stenning
 Nick Timkovich
 Nicolas Bock
+Nicole Harris
 Nikhil Benesch
 Nikolay Korolev
 Nitesh Sharma
@@ -419,6 +420,7 @@ Peter Lisák
 Peter Waller
 petr-tik
 Phaneendra Chiruvella
+Phil Elson
 Phil Freo
 Phil Pennock
 Phil Whelan

NEWS.rst

@@ -1,3 +1,29 @@
+20.2b1 (2020-05-21)
+===================
+
+Deprecations and Removals
+-------------------------
+
+- Drop parallelization from ``pip list --outdated``. (`#8167 <https://github.com/pypa/pip/issues/8167>`_)
+
+Bug Fixes
+---------
+
+- Correctly treat wheels contenting non-ASCII file contents so they can be
+  installed on Windows. (`#5712 <https://github.com/pypa/pip/issues/5712>`_)
+- Revert building of local directories in place, restoring the pre-20.1
+  behaviour of copying to a temporary directory. (`#7555 <https://github.com/pypa/pip/issues/7555>`_)
+- Prompt the user for password if the keyring backend doesn't return one (`#7998 <https://github.com/pypa/pip/issues/7998>`_)
+- Fix metadata permission issues when umask has the executable bit set. (`#8164 <https://github.com/pypa/pip/issues/8164>`_)
+- Avoid unnecessary message about the wheel package not being installed
+  when a wheel would not have been built. Additionally, clarify the message. (`#8178 <https://github.com/pypa/pip/issues/8178>`_)
+
+Improved Documentation
+----------------------
+
+- Add GitHub issue template for reporting when the dependency resolver fails (`#8207 <https://github.com/pypa/pip/issues/8207>`_)
+
+
 .. NOTE: You should *NOT* be adding new change log entries to this file, this
          file is managed by towncrier. You *may* edit previous change logs to
          fix problems like typo corrections or such.
@@ -7,6 +33,24 @@
 
 .. towncrier release notes start
 
+20.1.1 (2020-05-19)
+===================
+
+Deprecations and Removals
+-------------------------
+
+- Revert building of local directories in place, restoring the pre-20.1
+  behaviour of copying to a temporary directory. (`#7555 <https://github.com/pypa/pip/issues/7555>`_)
+- Drop parallelization from ``pip list --outdated``. (`#8167 <https://github.com/pypa/pip/issues/8167>`_)
+
+Bug Fixes
+---------
+
+- Fix metadata permission issues when umask has the executable bit set. (`#8164 <https://github.com/pypa/pip/issues/8164>`_)
+- Avoid unnecessary message about the wheel package not being installed
+  when a wheel would not have been built. Additionally, clarify the message. (`#8178 <https://github.com/pypa/pip/issues/8178>`_)
+
+
 20.1 (2020-04-28)
 =================
 

docs/html/development/architecture/anatomy.rst

@@ -25,7 +25,6 @@ The ``README``, license, ``pyproject.toml``, ``setup.py``, and so on are in the
 * ``setup.cfg``
 * ``setup.py``
 * ``tox.ini`` -- ``pip`` uses Tox, an automation tool, configured by this `tox.ini`_ file. ``tox.ini`` describes a few environments ``pip`` uses during development for simplifying how tests are run (complicated situation there). Example: ``tox -e -py36``. We can run tests for different versions of Python by changing “36” to “27” or similar.
-* ``.appveyor.yml``
 * ``.coveragerc``
 * ``.gitattributes``
 * ``.gitignore``

docs/html/development/ci.rst

@@ -66,9 +66,9 @@ Services
 pip test suite and checks are distributed on three different platforms that
 provides free executors for open source packages:
 
-  - `Travis CI`_ (Used for Linux)
-  - `Azure DevOps CI`_ (Linux, MacOS & Windows tests)
-  - `GitHub Actions`_ (Linux, MacOS & Windows tests)
+  - `GitHub Actions`_ (Used for code quality and development tasks)
+  - `Azure DevOps CI`_ (Used for tests)
+  - `Travis CI`_ (Used for PyPy tests)
 
 .. _`Travis CI`: https://travis-ci.org/
 .. _`Azure DevOps CI`: https://azure.microsoft.com/en-us/services/devops/
@@ -81,13 +81,13 @@ Current run tests
 Developer tasks
 ---------------
 
-======== =============== ================ ================== ============
-   OS          docs            lint           vendoring        packages
-======== =============== ================ ================== ============
-Linux     Travis, Github  Travis, Github    Travis, Github      Azure
-Windows                                                         Azure
-MacOS                                                           Azure
-======== =============== ================ ================== ============
+======== =============== ================ ================== =============
+   OS          docs            lint           vendoring        packaging
+======== =============== ================ ================== =============
+Linux     Travis, Github  Travis, Github    Travis, Github       Azure
+Windows       Github           Github           Github           Azure
+MacOS         Github           Github           Github           Azure
+======== =============== ================ ================== =============
 
 Actual testing
 --------------
@@ -113,9 +113,9 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.5 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.6 |   Azure       |   Azure         |
+|           |          | CP3.6 |   Azure       |                 |
 |           |          +-------+---------------+-----------------+
-|           |   x64    | CP3.7 |   Azure       |   Azure         |
+|           |   x64    | CP3.7 |   Azure       |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.8 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
@@ -137,15 +137,15 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
-|           |          | CP2.7 | Travis,Azure  |  Travis,Azure   |
+|           |          | CP2.7 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.5 | Travis,Azure  |  Travis,Azure   |
+|           |          | CP3.5 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.6 | Travis,Azure  |  Travis,Azure   |
+|           |          | CP3.6 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
-|           |   x64    | CP3.7 | Travis,Azure  |  Travis,Azure   |
+|           |   x64    | CP3.7 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |   Travis      |   Travis        |
+|           |          | CP3.8 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy  |   Travis      |   Travis        |
 |           |          +-------+---------------+-----------------+
@@ -173,7 +173,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |   x64    | CP3.7 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.8 |               |                 |
+|           |          | CP3.8 |   Azure       |   Azure         |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy  |               |                 |
 |           |          +-------+---------------+-----------------+

docs/html/development/contributing.rst

@@ -39,8 +39,11 @@ separately, as a "formatting cleanup" PR, if needed.
 Automated Testing
 =================
 
-All pull requests and merges to 'master' branch are tested using `Travis CI`_
-and `Appveyor CI`_ based on our `.travis.yml`_ and `.appveyor.yml`_ files.
+All pull requests and merges to 'master' branch are tested using `Travis CI`_,
+`Azure Pipelines`_ and `GitHub Actions`_ based on our `.travis.yml`_,
+`.azure-pipelines`_ and `.github/workflows`_ files. More details about pip's
+Continuous Integration can be found in the `CI Documentation`_
+
 
 You can find the status and results to the CI runs for your PR on GitHub's web
 UI for the pull request. You can also find links to the CI services' pages for
@@ -260,8 +263,11 @@ will initiate a vote among the existing maintainers.
 .. _`Studies have shown`: https://www.kessler.de/prd/smartbear/BestPracticesForPeerCodeReview.pdf
 .. _`resolve merge conflicts`: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line
 .. _`Travis CI`: https://travis-ci.org/
-.. _`Appveyor CI`: https://www.appveyor.com/
+.. _`Azure Pipelines`: https://azure.microsoft.com/en-in/services/devops/pipelines/
+.. _`GitHub Actions`: https://github.com/features/actions
 .. _`.travis.yml`: https://github.com/pypa/pip/blob/master/.travis.yml
-.. _`.appveyor.yml`: https://github.com/pypa/pip/blob/master/.appveyor.yml
+.. _`.azure-pipelines`: https://github.com/pypa/pip/blob/master/.azure-pipelines
+.. _`.github/workflows`: https://github.com/pypa/pip/blob/master/.github/workflows
+.. _`CI Documentation`: https://pip.pypa.io/en/latest/development/ci/
 .. _`towncrier`: https://pypi.org/project/towncrier/
 .. _`Testing the next-gen pip dependency resolver`: https://pradyunsg.me/blog/2020/03/27/pip-resolver-testing/

news/6754.feature

@@ -0,0 +1 @@
+Warn if index pages have unexpected content-type

news/7625.bugfix

@@ -0,0 +1 @@
+Fix normalizing path on Windows when installing package on another logical disk.

news/7693.feature

@@ -0,0 +1 @@
+Allow specifying ``--prefer-binary`` option in a requirements file

news/7968.bugfix

@@ -0,0 +1 @@
+The VCS commands run by pip as subprocesses don't merge stdout and stderr anymore, improving the output parsing by subsequent commands.

news/8072.doc

@@ -0,0 +1 @@
+Fix pip config docstring so that the subcommands render correctly in the docs

news/d9f9c55b-f959-456f-a849-ee976ef227de.trivial

@@ -0,0 +1,2 @@
+Refactor the commands by removing the ``__init__`` method and defining and explicit
+``add_options`` method for adding command options.

noxfile.py

@@ -274,11 +274,12 @@ def upload_release(session):
             f"Remove dist/ and run 'nox -s build-release -- {version}'"
         )
     # Sanity check: Make sure the files are correctly named.
+    distfile_names = map(os.path.basename, distribution_files)
     expected_distribution_files = [
-        f"dist/pip-{version}-py2.py3-none-any.whl",
-        f"dist/pip-{version}.tar.gz",
+        f"pip-{version}-py2.py3-none-any.whl",
+        f"pip-{version}.tar.gz",
     ]
-    if sorted(distribution_files) != sorted(expected_distribution_files):
+    if sorted(distfile_names) != sorted(expected_distribution_files):
         session.error(
             f"Distribution files do not seem to be for {version} release."
         )

setup.cfg

@@ -38,6 +38,19 @@ ignore_errors = True
 
 [tool:pytest]
 addopts = --ignore src/pip/_vendor --ignore tests/tests_cache -r aR
+markers =
+    network: tests that need network
+    incompatible_with_test_venv
+    incompatible_with_venv
+    no_auto_tempdir_manager
+    unit: unit tests
+    integration: integration tests
+    bzr: VCS: Bazaar
+    svn: VCS: Subversion
+    mercurial: VCS: Mercurial
+    git: VCS: git
+    yaml: yaml based tests
+    fails_on_new_resolver: Does not yet work on the new resolver
 
 [bdist_wheel]
 universal = 1

src/pip/__init__.py

@@ -4,7 +4,7 @@
     from typing import List, Optional
 
 
-__version__ = "20.2.dev0"
+__version__ = "20.2.dev1"
 
 
 def main(args=None):

src/pip/_internal/build_env.py

@@ -193,6 +193,8 @@ def install_requirements(
             args.extend(['--trusted-host', host])
         if finder.allow_all_prereleases:
             args.append('--pre')
+        if finder.prefer_binary:
+            args.append('--prefer-binary')
         args.append('--')
         args.extend(requirements)
         with open_spinner(message) as spinner: