Merge branch 'bugfix/3766' of github.com:pypa/pipenv into bugfix/3766

.azure-pipelines/steps/reinstall-pythons.yml

@@ -0,0 +1,34 @@
+steps:
+  - script: |
+      # When you paste this, please make sure the indentation is preserved
+      # Fail out if any setups fail
+      set -e
+
+      # Delete old Pythons
+      rm -rf $AGENT_TOOLSDIRECTORY/Python/2.7.16
+      rm -rf $AGENT_TOOLSDIRECTORY/Python/3.5.7
+      rm -rf $AGENT_TOOLSDIRECTORY/Python/3.7.3
+      [ -e $AGENT_TOOLSDIRECTORY/Python/3.7.2 ] && [ -e $AGENT_TOOLSDIRECTORY/Python/3.5.5 ] && [ -e $AGENT_TOOLSDIRECTORY/Python/2.7.15 ] && exit 0
+      # Download new Pythons
+      azcopy --recursive \
+        --source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/2.7.15 \
+        --destination $AGENT_TOOLSDIRECTORY/Python/2.7.15
+
+      azcopy --recursive \
+        --source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.5.5 \
+        --destination $AGENT_TOOLSDIRECTORY/Python/3.5.5
+
+      azcopy --recursive \
+        --source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.7.2 \
+        --destination $AGENT_TOOLSDIRECTORY/Python/3.7.2
+
+      # Install new Pythons
+      original_directory=$PWD
+      setups=$(find $AGENT_TOOLSDIRECTORY/Python -name setup.sh)
+      for setup in $setups; do
+          chmod +x $setup;
+          cd $(dirname $setup);
+          ./$(basename $setup);
+          cd $original_directory;
+      done;
+    displayName: 'Workaround: roll back Python versions'

azure-pipelines.yml

@@ -9,6 +9,8 @@ trigger:
     - docs/*
     - news/*
     - peeps/*
+    - examples/*
+    - pytest.ini
     - README.md
     - pipenv/*.txt
     - CHANGELOG.rst
@@ -28,16 +30,17 @@ jobs:
   strategy:
     matrix:
       Python27:
-        python.version: '2.7.16'
+        python.version: '2.7'
         python.architecture: x64
       Python36:
-        python.version: '3.6.8'
+        python.version: '3.6'
         python.architecture: x64
       Python37:
-        python.version: '3.7.3'
+        python.version: '3.7'
         python.architecture: x64
     maxParallel: 4
   steps:
+  - template: .azure-pipelines/steps/reinstall-pythons.yml
   - template: .azure-pipelines/steps/run-tests.yml
     parameters:
       vmImage: 'Ubuntu-16.04'
@@ -46,9 +49,10 @@ jobs:
   pool:
     vmImage: 'Ubuntu-16.04'
   variables:
-    python.version: '3.7.3'
+    python.version: '3.7'
     python.architecture: x64
   steps:
+    - template: .azure-pipelines/steps/reinstall-pythons.yml
     - template: .azure-pipelines/steps/run-vendor-scripts.yml
       parameters:
         vmImage: 'Ubuntu-16.04'
@@ -57,9 +61,10 @@ jobs:
   pool:
     vmImage: 'Ubuntu-16.04'
   variables:
-    python.version: '3.7.3'
+    python.version: '3.7'
     python.architecture: x64
   steps:
+    - template: .azure-pipelines/steps/reinstall-pythons.yml
     - template: .azure-pipelines/steps/build-package.yml
       parameters:
         vmImage: 'Ubuntu-16.04'
@@ -90,13 +95,13 @@ jobs:
   strategy:
     matrix:
       Python27:
-        python.version: '2.7.16'
+        python.version: '2.7'
         python.architecture: x64
       Python36:
-        python.version: '3.6.8'
+        python.version: '3.6'
         python.architecture: x64
       Python37:
-        python.version: '3.7.3'
+        python.version: '3.7'
         python.architecture: x64
     maxParallel: 4
   steps:

news/3794.bugfix.rst

@@ -0,0 +1 @@
+Fix a bug that installation errors are displayed as a list.

pipenv/core.py

@@ -664,7 +664,7 @@ def _cleanup_procs(procs, failed_deps_queue, retry=True):
                 # We echo both c.out and c.err because pip returns error details on out.
                 err = c.err.strip().splitlines() if c.err else []
                 out = c.out.strip().splitlines() if c.out else []
-                err_lines = [line for line in [out, err]]
+                err_lines = [line for message in [out, err] for line in message]
                 # Return the subprocess' return code.
                 raise exceptions.InstallError(c.dep.name, extra=err_lines)
             # Save the Failed Dependency for later.