Drop support for Python 3.2

12 files changed, 21 insertions, 39 deletions

diff --git a/.travis.yml b/.travis.yml
index d71b14cc1..49c5c276e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ matrix:
           env: TOXENV=py26
         - python: 2.7
           env: TOXENV=py27
-        - python: 3.2
-          env: TOXENV=py32
         - python: 3.3
           env: TOXENV=py33
         - python: 3.4
diff --git a/.travis/run.sh b/.travis/run.sh
index a26183409..8a02b6301 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -54,8 +54,4 @@ fi
 tox -- -m unit $TOXARGS
 
 # Run our integration tests
-# Note: There is an issue with Python 3.2 where concurrent imports will corrupt
-#       the generated .pyc files and we'll get very strange errors. However as
-#       long as we continue to run the unit tests first and in a seperate step
-#       then this should work fine.
 tox -- -m integration -n 8 $TOXARGS
diff --git a/CHANGES.txt b/CHANGES.txt
index 5c3d279dd..0490a89e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
 **8.0.0 (unreleased)**
 
+* **BACKWARD INCOMPATIBLE** Drop support for Python 3.2.
+
 * **BACKWARD INCOMPATIBLE** Remove the ability to find any files other than the
   ones directly linked from the index or find-links pages.
 
diff --git a/docs/installing.rst b/docs/installing.rst
index b921dbb09..bfa2356d5 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -102,15 +102,10 @@ On Windows [5]_:
 Python and OS Compatibility
 ---------------------------
 
-pip works with CPython versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 and also pypy.
+pip works with CPython versions 2.6, 2.7, 3.3, 3.4, 3.5 and also pypy.
 
 pip works on Unix/Linux, OS X, and Windows.
 
-.. note::
-
-  Python 2.5 was supported through v1.3.1, and Python 2.4 was supported through
-  v1.1.
-
 
 ----
 
diff --git a/pip/_vendor/README.rst b/pip/_vendor/README.rst
index bff1935e6..0fe39afa5 100644
--- a/pip/_vendor/README.rst
+++ b/pip/_vendor/README.rst
@@ -12,7 +12,6 @@ Modifications
 * pkg_resources has been modified to import _markerlib from pip._vendor
 * markerlib has been modified to import its API from pip._vendor
 * CacheControl has been modified to import it's dependencies from pip._vendor
-* progress has been modified to not use unicode literals for support for Python 3.2
 
 
 _markerlib and pkg_resources
diff --git a/pip/_vendor/progress/bar.py b/pip/_vendor/progress/bar.py
index 8fbfe832c..8ce146100 100644
--- a/pip/_vendor/progress/bar.py
+++ b/pip/_vendor/progress/bar.py
@@ -14,9 +14,6 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from __future__ import unicode_literals
-
-
 from . import Progress
 from .helpers import WritelnMixin
 
@@ -48,22 +45,22 @@ class ChargingBar(Bar):
     suffix = '%(percent)d%%'
     bar_prefix = ' '
     bar_suffix = ' '
-    empty_fill = '∙'
-    fill = '█'
+    empty_fill = u'∙'
+    fill = u'█'
 
 
 class FillingSquaresBar(ChargingBar):
-    empty_fill = '▢'
-    fill = '▣'
+    empty_fill = u'▢'
+    fill = u'▣'
 
 
 class FillingCirclesBar(ChargingBar):
-    empty_fill = '◯'
-    fill = '◉'
+    empty_fill = u'◯'
+    fill = u'◉'
 
 
 class IncrementalBar(Bar):
-    phases = (' ', '▏', '▎', '▍', '▌', '▋', '▊', '▉', '█')
+    phases = (u' ', u'▏', u'▎', u'▍', u'▌', u'▋', u'▊', u'▉', u'█')
 
     def update(self):
         nphases = len(self.phases)
@@ -83,4 +80,4 @@ class IncrementalBar(Bar):
 
 
 class ShadyBar(IncrementalBar):
-    phases = (' ', '░', '▒', '▓', '█')
+    phases = (u' ', u'░', u'▒', u'▓', u'█')
diff --git a/pip/_vendor/progress/counter.py b/pip/_vendor/progress/counter.py
index bcd6812d4..caaddc680 100644
--- a/pip/_vendor/progress/counter.py
+++ b/pip/_vendor/progress/counter.py
@@ -14,8 +14,6 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from __future__ import unicode_literals
-
 from . import Infinite, Progress
 from .helpers import WriteMixin
 
@@ -36,7 +34,7 @@ class Countdown(WriteMixin, Progress):
 
 
 class Stack(WriteMixin, Progress):
-    phases = (' ', '▁', '▂', '▃', '▄', '▅', '▆', '▇', '█')
+    phases = (u' ', u'▁', u'▂', u'▃', u'▄', u'▅', u'▆', u'▇', u'█')
     hide_cursor = True
 
     def update(self):
@@ -46,4 +44,4 @@ class Stack(WriteMixin, Progress):
 
 
 class Pie(Stack):
-    phases = ('○', '◔', '◑', '◕', '●')
+    phases = (u'○', u'◔', u'◑', u'◕', u'●')
diff --git a/pip/_vendor/progress/helpers.py b/pip/_vendor/progress/helpers.py
index 1557f27a6..9ed90b2bc 100644
--- a/pip/_vendor/progress/helpers.py
+++ b/pip/_vendor/progress/helpers.py
@@ -13,7 +13,6 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 from __future__ import print_function
-from __future__ import unicode_literals
 
 
 HIDE_CURSOR = '\x1b[?25l'
diff --git a/pip/_vendor/progress/spinner.py b/pip/_vendor/progress/spinner.py
index f68043e4f..969bfbb5c 100644
--- a/pip/_vendor/progress/spinner.py
+++ b/pip/_vendor/progress/spinner.py
@@ -14,8 +14,6 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from __future__ import unicode_literals
-
 from . import Infinite
 from .helpers import WriteMixin
 
@@ -31,12 +29,12 @@ class Spinner(WriteMixin, Infinite):
 
 
 class PieSpinner(Spinner):
-    phases = ['◷', '◶', '◵', '◴']
+    phases = [u'◷', u'◶', u'◵', u'◴']
 
 
 class MoonSpinner(Spinner):
-    phases = ['◑', '◒', '◐', '◓']
+    phases = [u'◑', u'◒', u'◐', u'◓']
 
 
 class LineSpinner(Spinner):
-    phases = ['⎺', '⎻', '⎼', '⎽', '⎼', '⎻']
+    phases = [u'⎺', u'⎻', u'⎼', u'⎽', u'⎼', u'⎻']
diff --git a/pip/_vendor/vendor.txt b/pip/_vendor/vendor.txt
index 4e472c63e..706e9dac7 100644
--- a/pip/_vendor/vendor.txt
+++ b/pip/_vendor/vendor.txt
@@ -6,6 +6,6 @@ requests==2.7.0
 CacheControl==0.11.5

 lockfile==0.10.2

 progress==1.2

-ipaddress==1.0.14  # Only needed on 2.6, 2.7, and 3.2

+ipaddress==1.0.14  # Only needed on 2.6 and 2.7

 packaging==15.3

 retrying==1.3.3

diff --git a/setup.py b/setup.py
index 069cf51e3..43bab4028 100644
--- a/setup.py
+++ b/setup.py
@@ -58,9 +58,9 @@ setup(
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: Implementation :: PyPy"
     ],
     keywords='easy_install distutils setuptools egg virtualenv',
diff --git a/tox.ini b/tox.ini
index abbd70c8a..2d6ae9cf2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    docs, packaging, pep8, py3pep8, py26, py27, py32, py33, py34, py35, pypy
+    docs, packaging, pep8, py3pep8, py26, py27, py33, py34, py35, pypy
 
 [testenv]
 setenv =
@@ -20,10 +20,10 @@ basepython = python2.7
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
 
 [testenv:packaging]
-deps = 
+deps =
     check-manifest
     readme
-commands = 
+commands =
     check-manifest
     python setup.py check -m -r -s