Merge branch 'master' of https://github.com/pypa/pip into patch-1

Author: thijstriemstra

.gitattributes

@@ -0,0 +1,4 @@
+# Patches must have Unix-style line endings, even on Windows
+tasks/vendoring/patches/* eol=lf
+# The CA Bundle should always use Unix-style line endings, even on Windows
+src/pip/_vendor/certifi/*.pem eol=lf

.mailmap

@@ -5,18 +5,22 @@ Anatoly Techtonik                                           <[email protected]
 Andrey Bulgakov                                             <[email protected]>
                     <[email protected]>                      <[email protected]>
 Andrei Geacar       <[email protected]>      unknown  <hakaton@Anam-mbl.(none)>
+Anish Tambe         <[email protected]>                  <[email protected]>
+Bartek Ogryczak     <[email protected]>                  <[email protected]>
 Ben Rosser                                                  <[email protected]>
                     <[email protected]>               <[email protected]>
                     <[email protected]>                      <[email protected]>
 Daniel Holth                                                <[email protected]>
 David Black                                                 <[email protected]>
                     <[email protected]>                      <[email protected]>
 Dongweiming         <[email protected]>           <[email protected]>
+Dustin Ingram       <[email protected]>                           <[email protected]>
 Endoh Takanao                                               <[email protected]>
 Erik M. Bray                                                <[email protected]>
 Gabriel de Perthuis                                         <[email protected]>
 Geoffrey Lehée                                              <[email protected]>
 Hsiaoming Yang                                              <[email protected]>
+Igor Kuzmitshov     <[email protected]>                    <[email protected]>
 Ilya Baryshev                                               <[email protected]>
 Jakub Stasiak                                               <[email protected]>
 John-Scott Atlakson                                         <[email protected]>
@@ -35,5 +39,8 @@ Przemek Wrzos                                               <hetmankp@none>
                     <[email protected]>                   <[email protected]>
 Romuald Brunet      <[email protected]>                    <[email protected]>
 Thomas Johansson    <devnull@localhost>            prencher <devnull@localhost>
+Thomas Kluyver      <[email protected]>                  <[email protected]>
+Stephan Erb         <[email protected]>                  <[email protected]>
+Victor Stinner      <[email protected]>              <[email protected]>
 Yoval P                                                     <[email protected]>
 Zhiping Deng                                                <[email protected]>

.travis/run.sh

@@ -2,6 +2,28 @@
 set -e
 set -x
 
+# Short circuit tests and linting jobs if there are no code changes involved.
+if [[ $TOXENV != docs ]]; then
+    if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]
+    then
+        echo "This is not a PR -- will do a complete build."
+    else
+        # Pull requests are slightly complicated because $TRAVIS_COMMIT_RANGE
+        # may include more changes than desired if the history is convoluted.
+        # Instead, explicitly fetch the base branch and compare against the
+        # merge-base commit.
+        git fetch -q origin +refs/heads/$TRAVIS_BRANCH
+        changes=$(git diff --name-only HEAD $(git merge-base HEAD FETCH_HEAD))
+        echo "Files changed:"
+        echo "$changes"
+        if ! echo "$changes" | grep -qvE '(\.rst$)|(^docs)|(^news)|(^\.github)'
+        then
+            echo "Only Documentation was updated -- skipping build."
+            exit
+        fi
+    fi
+fi
+
 if [[ $TOXENV == py* ]]; then
     # Run unit tests
     tox -- -m unit

AUTHORS.txt

@@ -1,5 +1,6 @@
 Adam Chainz <[email protected]>
 Adam Wentz <[email protected]>
+Alan Yee <[email protected]>
 Aleks Bunin <[email protected]>
 Alex Gaynor <[email protected]>
 Alex Grönholm <[email protected]>
@@ -12,27 +13,40 @@ Andrei Geacar <[email protected]>
 Andrey Bulgakov <[email protected]>
 Andy Freeland <[email protected]>
 Andy Kluger <[email protected]>
+Anish Tambe <[email protected]>
 Anrs Hu <[email protected]>
+Anthony Sottile <[email protected]>
 Antoine Musso <[email protected]>
 Anton Ovchinnikov <[email protected]>
 Anton Patrushev <[email protected]>
 Antonio Alvarado Hernandez <[email protected]>
+Antony Lee <[email protected]>
 Antti Kaihola <[email protected]>
+Anubhav Patel <[email protected]>
+Anuj Godase <[email protected]>
 AQNOUCH Mohammed <[email protected]>
+AraHaan <[email protected]>
 Arindam Choudhury <[email protected]>
 Armin Ronacher <[email protected]>
 Ashley Manton <[email protected]>
+Atsushi Odagiri <[email protected]>
+Avner Cohen <[email protected]>
 Baptiste Mispelon <[email protected]>
+Bartek Ogryczak <[email protected]>
 Ben Darnell <[email protected]>
+Ben Hoyt <[email protected]>
 Ben Rosser <[email protected]>
 Bence Nagy <[email protected]>
 Benjamin VanEvery <[email protected]>
+Benoit Pierre <[email protected]>
 Berker Peksag <[email protected]>
 Bernardo B. Marques <[email protected]>
 Bogdan Opanchuk <[email protected]>
 Brad Erickson <[email protected]>
 Bradley Ayers <[email protected]>
+Brandon L. Reiss <[email protected]>
 Brian Rosner <[email protected]>
+BrownTruck <[email protected]>
 Bruno Oliveira <[email protected]>
 Bruno Renié <[email protected]>
 Buck Golemon <[email protected]>
@@ -50,6 +64,7 @@ Chris Brinker <[email protected]>
 Chris Jerdonek <[email protected]>
 Chris McDonough <[email protected]>
 Chris Wolfe <[email protected]>
+Christian Heimes <[email protected]>
 Christian Oudard <[email protected]>
 Christopher Snyder <[email protected]>
 Clark Boylan <[email protected]>
@@ -58,10 +73,14 @@ Cody <[email protected]>
 Cody Soyland <[email protected]>
 Colin Watson <[email protected]>
 Connor Osborn <[email protected]>
+Cooper Lees <[email protected]>
+Cooper Ry Lees <[email protected]>
 Cory Benfield <[email protected]>
 Cory Wright <[email protected]>
 Craig Kerstiens <[email protected]>
 Cristian Sorinel <[email protected]>
+Curtis Doty <[email protected]>
+Damian Quiroga <[email protected]>
 Dan Savilonis <[email protected]>
 Dan Sully <[email protected]>
 daniel <[email protected]>
@@ -78,6 +97,7 @@ David Caro <[email protected]>
 David Evans <[email protected]>
 David Linke <[email protected]>
 David Pursehouse <[email protected]>
+David Tucker <[email protected]>
 David Wales <[email protected]>
 Davidovich <[email protected]>
 derwolfe <[email protected]>
@@ -86,37 +106,51 @@ Domen Kožar <[email protected]>
 Donald Stufft <[email protected]>
 Dongweiming <[email protected]>
 Douglas Thor <[email protected]>
+Dustin Ingram <[email protected]>
 Dwayne Bailey <[email protected]>
+Ed Morley <[email protected]>
 Ed Morley <[email protected]>
 Emil Styrke <[email protected]>
 Endoh Takanao <[email protected]>
 enoch <[email protected]>
 Eric Gillingham <[email protected]>
 Eric Hanchrow <[email protected]>
+Eric Hopper <[email protected]>
 Erik M. Bray <[email protected]>
 Erik Rose <[email protected]>
+Erwin Janssen <[email protected]>
 Eugene Vereshchagin <[email protected]>
+fiber-space <[email protected]>
+Filip Kokosiński <[email protected]>
 Florian Briand <[email protected]>
 Francesco <[email protected]>
 Francesco Montesano <[email protected]>
+Gabriel Curio <[email protected]>
 Gabriel de Perthuis <[email protected]>
 Garry Polley <[email protected]>
+gdanielson <[email protected]>
 Geoffrey Lehée <[email protected]>
 Geoffrey Sneddon <[email protected]>
 George Song <[email protected]>
 Georgi Valkov <[email protected]>
+Giftlin Rajaiah <[email protected]>
 gizmoguy1 <[email protected]>
+GOTO Hayato <[email protected]>
 Guilherme Espada <[email protected]>
 Guy Rozendorn <[email protected]>
+Hari Charan <[email protected]>
 Herbert Pfennig <[email protected]>
 Hsiaoming Yang <[email protected]>
+Hugo <[email protected]>
 Hugo Lopes Tavares <[email protected]>
 Hynek Schlawack <[email protected]>
 Ian Bicking <[email protected]>
 Ian Cordasco <[email protected]>
 Ian Lee <[email protected]>
+Ian Stapleton Cordasco <[email protected]>
 Ian Wienand <[email protected]>
 Ian Wienand <[email protected]>
+Igor Kuzmitshov <[email protected]>
 Igor Sobreira <[email protected]>
 Ilya Baryshev <[email protected]>
 INADA Naoki <[email protected]>
@@ -141,6 +175,7 @@ Jim Garrison <[email protected]>
 Jivan Amara <[email protected]>
 John-Scott Atlakson <[email protected]>
 Jon Banafato <[email protected]>
+Jon Dufresne <[email protected]>
 Jon Parise <[email protected]>
 Jon Wayne Parrott <[email protected]>
 Jonas Nockert <[email protected]>
@@ -163,24 +198,30 @@ Kevin Burke <[email protected]>
 Kevin Carter <[email protected]>
 Kevin Frommelt <[email protected]>
 Kit Randel <[email protected]>
+kpinc <[email protected]>
 Kumar McMillan <[email protected]>
 Kyle Persohn <[email protected]>
 Laurent Bristiel <[email protected]>
 Leon Sasson <[email protected]>
 Lev Givon <[email protected]>
 Lincoln de Sousa <[email protected]>
 Lipis <[email protected]>
+Lucas Cimon <[email protected]>
 Ludovic Gasc <[email protected]>
 Luke Macken <[email protected]>
-Luo Jiebin <[email protected]>
+Luo Jiebin <[email protected]>
+luojiebin <[email protected]>
+luz.paz <[email protected]>
 Marc Abramowitz <[email protected]>
 Marc Tamlyn <[email protected]>
 Marcus Smith <[email protected]>
+Mariatta <[email protected]>
 Mark Kohler <[email protected]>
 Markus Hametner <[email protected]>
 Masklinn <[email protected]>
 Matej Stuchlik <[email protected]>
 Mathew Jennings <[email protected]>
+Mathieu Bridon <[email protected]>
 Matt Good <[email protected]>
 Matt Maker <[email protected]>
 Matt Robenolt <[email protected]>
@@ -189,7 +230,9 @@ Matthew Einhorn <[email protected]>
 Matthew Gilliard <[email protected]>
 Matthew Iversen <[email protected]>
 Matthew Trumbell <[email protected]>
+Matthew Willson <[email protected]>
 Matthias Bussonnier <[email protected]>
+mattip <[email protected]>
 Maxim Kurnikov <[email protected]>
 Maxime Rouyrre <[email protected]>
 memoselyk <[email protected]>
@@ -209,19 +252,23 @@ Nate Coraor <[email protected]>
 Nathaniel J. Smith <[email protected]>
 Nick Coghlan <[email protected]>
 Nick Stenning <[email protected]>
+Nikhil Benesch <[email protected]>
 Nowell Strite <[email protected]>
 nvdv <[email protected]>
 Ofekmeister <[email protected]>
 Oliver Tonnhofer <[email protected]>
 Olivier Girardot <[email protected]>
 Olivier Grisel <[email protected]>
 Ollie Rutherfurd <[email protected]>
+OMOTO Kenji <[email protected]>
 Oren Held <[email protected]>
 Oscar Benjamin <[email protected]>
+Oz N Tiram <[email protected]>
 Patrick Dubroy <[email protected]>
 Patrick Jenkins <[email protected]>
 Patrick Lawson <[email protected]>
 patricktokeeffe <[email protected]>
+Paul Kehrer <[email protected]>
 Paul Moore <[email protected]>
 Paul Nasrat <[email protected]>
 Paul Oswald <[email protected]>
@@ -232,15 +279,18 @@ Pekka Klärck <[email protected]>
 Peter Waller <[email protected]>
 Phaneendra Chiruvella <[email protected]>
 Phil Freo <[email protected]>
+Phil Pennock <[email protected]>
 Phil Whelan <[email protected]>
 Philippe Ombredanne <[email protected]>
-Pierre-Yves Rofes <[email protected]>
 Pi Delport <[email protected]>
-Pradyun <[email protected]>
-Pradyun S. Gedam <[email protected]>
+Pierre-Yves Rofes <[email protected]>
+pip <[email protected]>
+Pradyun Gedam <[email protected]>
+Pratik Mallya <[email protected]>
 Preston Holmes <[email protected]>
 Przemek Wrzos <hetmankp@none>
 Qiangning Hong <[email protected]>
+R. David Murray <[email protected]>
 Rafael Caricio <[email protected]>
 Ralf Schmitt <[email protected]>
 Razzi Abuissa <[email protected]>
@@ -270,6 +320,7 @@ schlamar <[email protected]>
 Scott Kitterman <[email protected]>
 seanj <[email protected]>
 Sebastian Schaetz <[email protected]>
+Segev Finer <[email protected]>
 Sergey Vasilyev <[email protected]>
 Seth Woodworth <[email protected]>
 Simeon Visser <[email protected]>
@@ -278,7 +329,7 @@ Simon Pichugin <[email protected]>
 Sorin Sbarnea <[email protected]>
 Stavros Korokithakis <[email protected]>
 Stefan Scherfke <[email protected]>
-Stephan Erb <[email protected]>
+Stephan Erb <[email protected]>
 stepshal <[email protected]>
 Steve (Gadget) Barnes <[email protected]>
 Steve Barnes <[email protected]>
@@ -293,7 +344,7 @@ Thomas Fenzl <[email protected]>
 Thomas Grainger <[email protected]>
 Thomas Guettler <[email protected]>
 Thomas Johansson <devnull@localhost>
-Thomas Kluyver <[email protected]>
+Thomas Kluyver <[email protected]>
 Thomas Smith <[email protected]>
 Tim D. Smith <[email protected]>
 Tim Harder <[email protected]>
@@ -307,10 +358,10 @@ Toshio Kuratomi <[email protected]>
 Travis Swicegood <[email protected]>
 Valentin Haenel <[email protected]>
 Victor Stinner <[email protected]>
-Victor Stinner <[email protected]>
 Viktor Szépe <[email protected]>
 Ville Skyttä <[email protected]>
 Vinay Sajip <[email protected]>
+Vincent Philippon <[email protected]>
 Vitaly Babiy <[email protected]>
 Vladimir Rutsky <[email protected]>
 W. Trevor King <[email protected]>
@@ -320,6 +371,7 @@ William ML Leslie <[email protected]>
 Wolfgang Maier <[email protected]>
 Xavier Fernandez <[email protected]>
 Xavier Fernandez <[email protected]>
+xoviat <[email protected]>
 YAMAMOTO Takashi <[email protected]>
 Yen Chi Hsuan <[email protected]>
 Yoval P <[email protected]>
@@ -328,3 +380,4 @@ Zearin <[email protected]>
 Zearin <[email protected]>
 Zhiping Deng <[email protected]>
 Zvezdan Petkovic <[email protected]>
+Семён Марьясин <[email protected]>

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2016 The pip developers (see AUTHORS.txt file)
+Copyright (c) 2008-2018 The pip developers (see AUTHORS.txt file)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the