Develop

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+branch = True
+omit =
+  pip/_vendor/*

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,13 @@
+* Pip version:
+* Python version:
+* Operating System:
+
+### Description:
+
+// REPLACE ME: What are you trying to get done, what has happened, what went wrong, and what did you expect?
+
+### What I've run:
+
+```
+// REPLACE ME: Paste a log of command(s) you ran and pip's output, tracebacks, etc, here
+```

.gitignore

@@ -1,13 +1,11 @@
+build/
+dist/
+docs/_build/
+pip.egg-info/
 MANIFEST
-pip.egg-info/*
-ScriptTest-*.egg
-virtualenv-*.egg
-mock-*egg
-dist/*
-docs/_build/*
-build/*
-*.pyc
-*.pyo
-*.~
 .tox
-
+*.egg
+*.py[cod]
+*~
+.coverage
+coverage.xml

.landscape.yml

@@ -0,0 +1,2 @@
+ignore-paths:
+    - pip/_vendor/

.mailmap

@@ -0,0 +1,36 @@
+Adam Wentz                                                  <awentz@theonion.com>
+Alex Grönholm                                               <alex.gronholm@nextday.fi>
+Alex Grönholm       <alex.gronholm@nextday.fi>              <alex.gronholm+git@nextday.fi>
+Anatoly Techtonik                                           <techtonik@gmail.com>
+Andrey Bulgakov                                             <mail@andreiko.ru>
+                    <mail@andreiko.ru>                      <bulgakov@tranio.ru>
+Andrei Geacar       <andrei.geacar@gmail.com>      unknown  <hakaton@Anam-mbl.(none)>
+Ben Rosser                                                  <rosser.bjr@gmail.com>
+                    <bradley.ayers@gmail.com>               <bradley.ayers@enigmainteractive.com>
+                    <carl@oddbird.net>                      <carl@dirtcircle.com>
+Daniel Holth                                                <dholth@fastmail.fm>
+David Black                                                 <db@d1b.org>
+                    <donald@stufft.io>                      <donald.stufft@gmail.com>
+Dongweiming         <dongweiming@admaster.com.cn>           <ciici1234@hotmail.com>
+Endoh Takanao                                               <djmchl@gmail.com>
+Erik M. Bray                                                <embray@stsci.edu>
+Gabriel de Perthuis                                         <g2p.code@gmail.com>
+Geoffrey Lehée                                              <geoffrey@lehee.name>
+Hsiaoming Yang                                              <lepture@me.com>
+Ilya Baryshev                                               <baryshev@gmail.com>
+Jakub Stasiak                                               <kuba.stasiak@gmail.com>
+John-Scott Atlakson                                         <john.scott.atlakson@gmail.com>
+Jorge Niedbalski                                            <niedbalski@gmail.com>
+                    <niedbalski@gmail.com>                  <jorge@nimbic.com>
+Ludovic Gasc        <gmludo@gmail.com>                      <git@gmludo.eu>
+Markus Hametner                                             <fin+github@xbhd.org>
+Masklinn                                                    <bitbucket.org@masklinn.net>
+Matthew Iversen     <teh.ivo@gmail.com>                     <teh.ivo@gmail.com>
+                    <pnasrat@gmail.com>                     <pnasrat@googlemail.com>
+Preston Holmes                                              <preston@ptone.com>
+Przemek Wrzos                                               <hetmankp@none>
+                    <hodgestar@gmail.com>                   <hodgestar+hg@gmail.com>
+Romuald Brunet      <romuald@chivil.com>                    <romuald@gandi.net>
+Thomas Johansson    <devnull@localhost>            prencher <devnull@localhost>
+Yoval P                                                     <yoval@gmx.com>
+Zhiping Deng                                                <kofreestyler@gmail.com>

.travis.yml

@@ -1,37 +1,49 @@
 language: python
 
-env:
-  - TOXENV=docs
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py32
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=pypy
-
-before_install:
-  - "[ -d ~/.distlib ] && sudo chown -R travis:travis ~/.distlib || true"
-
-install:
-  - sudo apt-get install subversion bzr mercurial
-  - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc
-  - git config --global user.email "python-virtualenv@googlegroups.com"
-  - git config --global user.name "Pip"
-  - pip install --upgrade setuptools
-  - pip install tox
-
-script: tox
-
-branches:
-  only:
-    - develop
-    - 1.3.X
-    - 1.4.X
-    - 1.5.X
+
+matrix:
+    include:
+        - env: TOXENV=docs
+        - env: TOXENV=pep8
+        - env: TOXENV=py3pep8
+        - env: TOXENV=packaging
+        - python: 2.6 # these are just to make travis's UI a bit prettier
+          env: TOXENV=py26
+        - python: 2.7
+          env: TOXENV=py27
+        - python: 3.3
+          env: TOXENV=py33
+        - python: 3.4
+          env: TOXENV=py34
+        - python: 3.5
+          env: TOXENV=py35
+        - python: nightly
+          env: TOXENV=py36
+        - python: pypy
+          env: TOXENV=pypy
+        - python: 2.7
+          env: TOXENV=py27 VENDOR=no
+        - python: 3.5
+          env: TOXENV=py35 VENDOR=no
+        - python: 2.7
+          env: TOXENV=py27 VENDOR=no WHEELS=yes
+        - python: 3.5
+          env: TOXENV=py35 VENDOR=no WHEELS=yes
+
+
+install: .travis/install.sh
+
+
+script: .travis/run.sh
+
 
 notifications:
   irc:
     channels:
-      - "irc.freenode.org#pypa-dev"
+      # This is set to a secure variable to prevent forks from notifying the
+      # IRC channel whenever they fail a build. This can be removed when travis
+      # implements https://github.com/travis-ci/travis-ci/issues/1094.
+      # The actual value here is: irc.freenode.org#pypa-dev
+      - secure: "zAlwcmrDThlRsZz7CPDGpj4ABTzf7bc/zQXYtvIuqmSj0yJMAwsO5Vx/+qdTGYBvmW/oHw2s/uUgtkZzntSQiVQToKMag2fs0d3wV5bLJQUE2Si2jnH2JOQo3JZWSo9HOqL6WYmlKGI8lH9FVTdVLgpeJmIpLy1bN4zx4/TiJjc="
     use_notice: true
     skip_join: true

.travis/install.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+set -x
+
+git config --global user.email "pypa-dev@googlegroups.com"
+git config --global user.name "pip"
+
+pip install --upgrade setuptools
+pip install --upgrade tox

.travis/run.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e
+set -x
+
+# We want to create the virtual environment here, but not actually run anything
+tox --notest
+
+# If we have a VENDOR=no then we want to reinstall pip into the virtual
+# environment without the vendor directory included as well as install the
+# dependencies we need installed.
+if [[ $VENDOR = "no" ]]; then
+    # Install our dependencies if we're not installing from wheels
+    if [[ $WHEELS != "yes" ]]; then
+        .tox/$TOXENV/bin/pip install -r pip/_vendor/vendor.txt --no-deps
+    fi
+
+    # Install our dependencies if we're installing from wheels
+    if [[ $WHEELS = "yes" ]]; then
+        mkdir -p /tmp/wheels
+        pip wheel --wheel-dir /tmp/wheels --no-deps -r pip/_vendor/vendor.txt
+        cp /tmp/wheels/* `echo .tox/$TOXENV/lib/python*/site-packages/pip/_vendor/`
+    fi
+
+    # Remove the vendored dependencies from within the installed pip inside of
+    # our installed copy of pip.
+    find .tox/$TOXENV/lib/python*/site-packages/pip/_vendor -d \
+        -not -regex '.*/pip/_vendor/__init__\.py$' \
+        -not -regex '.*/pip/_vendor$' \
+        -exec rm -rf {} \;
+
+    # Patch our installed pip/_vendor/__init__.py so that it knows to look for
+    # the vendored dependencies instead of only looking for the vendored.
+    sed -i 's/DEBUNDLED = False/DEBUNDLED = True/' \
+        .tox/$TOXENV/lib/python*/site-packages/pip/_vendor/__init__.py
+
+    # Test to make sure that we successfully installed without vendoring
+    if [ -f .tox/$TOXENV/lib/python*/site-packages/pip/_vendor/six.py ]; then
+        echo "Did not successfully unvendor"
+        exit 1
+    fi
+fi
+
+# Run the unit tests
+tox -- -m unit
+
+# Run our integration tests
+tox -- -m integration -n 8