Merge pull request #4343 from dstufft/no-2.6

Drop support for Python 2.6

Author: dstufft

.travis.yml

@@ -7,8 +7,6 @@ matrix:
     - 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

CHANGES.txt

@@ -1,4 +1,6 @@
-**9.1.0 (UNRELEASED)**
+**10.0.0 (UNRELEASED)**
+
+* **BACKWARD INCOMPATIBLE** Dropped support for Python 2.6.
 
 * **WARNING** pip 9.1 cache format has changed. Old versions of pip cannot
   read cache entries written by 9.1 but will handle this gracefully by

docs/installing.rst

@@ -46,9 +46,7 @@ speed), although neither are required to install pre-built :term:`wheels
 .. note::
 
    The get-pip.py script is supported on the same python version as pip.
-   For the now unsupported Python 3.2, an alternate script is available
-   `here <https://bootstrap.pypa.io/3.2/get-pip.py>`__. For Python 2.6
-   which will be unsupported in pip 10.0, an alternative script is available
+   For the now unsupported Python 2.6, alternate script is available
    `here <https://bootstrap.pypa.io/2.6/get-pip.py>`__.
 
 
@@ -110,11 +108,10 @@ On Windows [5]_:
 Python and OS Compatibility
 ---------------------------
 
-pip works with CPython versions 2.6, 2.7, 3.3, 3.4, 3.5 and also pypy.
+pip works with CPython versions 2.7, 3.3, 3.4, 3.5, 3.6 and also pypy.
 
-This means pip works on the latest patch version of each of these minor versions
-(i.e. 2.6.9 for 2.6, etc).
-Previous patch versions are supported on a best effort approach.
+This means pip works on the latest patch version of each of these minor
+versions. Previous patch versions are supported on a best effort approach.
 
 pip works on Unix/Linux, macOS, and Windows.
 

pip/_vendor/html5lib/filters/alphabeticalattributes.py

@@ -5,7 +5,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from pip._vendor.ordereddict import OrderedDict
+    from ordereddict import OrderedDict
 
 
 class Filter(base.Filter):

pip/_vendor/html5lib/html5parser.py

@@ -6,7 +6,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from pip._vendor.ordereddict import OrderedDict
+    from ordereddict import OrderedDict
 
 from . import _inputstream
 from . import _tokenizer

pip/_vendor/html5lib/treewalkers/etree.py

@@ -4,7 +4,7 @@
     from collections import OrderedDict
 except ImportError:
     try:
-        from pip._vendor.ordereddict import OrderedDict
+        from ordereddict import OrderedDict
     except ImportError:
         OrderedDict = dict
 

pip/_vendor/ordereddict.py

@@ -86,7 +86,7 @@ class names, and the use of '+', '|' and '^' operators.
     from collections import OrderedDict as _OrderedDict
 except ImportError:
     try:
-        from pip._vendor.ordereddict import OrderedDict as _OrderedDict
+        from ordereddict import OrderedDict as _OrderedDict
     except ImportError:
         _OrderedDict = None
 

pip/_vendor/pyparsing.py

@@ -7,7 +7,6 @@ colorama==0.3.7
 CacheControl==0.12.1
 msgpack-python==0.4.8
 lockfile==0.12.2
-ordereddict==1.1  # Only needed on 2.6
 progress==1.2
 ipaddress==1.0.18  # Only needed on 2.6 and 2.7
 packaging==16.8

pip/_vendor/vendor.txt

@@ -2,10 +2,10 @@
 from __future__ import absolute_import
 
 import logging
+import logging.config
 import os
 import sys
 import optparse
-import warnings
 
 from pip import cmdoptions
 from pip.index import PackageFinder
@@ -14,14 +14,13 @@
 from pip.exceptions import (BadCommand, InstallationError, UninstallationError,
                             CommandError, PreviousBuildDirError)
 
-from pip.compat import logging_dictConfig
 from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter
 from pip.req import InstallRequirement, parse_requirements
 from pip.status_codes import (
     SUCCESS, ERROR, UNKNOWN_ERROR, VIRTUALENV_NOT_FOUND,
     PREVIOUS_BUILD_DIR_ERROR,
 )
-from pip.utils import deprecation, get_prog, normalize_path
+from pip.utils import get_prog, normalize_path
 from pip.utils.logging import IndentingFormatter
 from pip.utils.outdated import pip_version_check
 
@@ -123,7 +122,7 @@ def main(self, args):
         if options.log:
             root_level = "DEBUG"
 
-        logging_dictConfig({
+        logging.config.dictConfig({
             "version": 1,
             "disable_existing_loggers": False,
             "filters": {
@@ -186,14 +185,6 @@ def main(self, args):
             ),
         })
 
-        if sys.version_info[:2] == (2, 6):
-            warnings.warn(
-                "Python 2.6 is no longer supported by the Python core team, "
-                "please upgrade your Python. A future version of pip will "
-                "drop support for Python 2.6",
-                deprecation.Python26DeprecationWarning
-            )
-
         # TODO: try to get these passing down from the command?
         #      without resorting to os.environ to hold these.
 

pip/basecommand.py

@@ -135,7 +135,7 @@ def run(self, options, args):
             options.abi,
             options.implementation,
         ])
-        binary_only = FormatControl(set(), set([':all:']))
+        binary_only = FormatControl(set(), {':all:'})
         if dist_restriction_set and options.format_control != binary_only:
             raise CommandError(
                 "--only-binary=:all: must be set and --no-binary must not "

pip/commands/download.py

@@ -9,7 +9,7 @@
 from pip.wheel import WheelCache
 
 
-DEV_PKGS = ('pip', 'setuptools', 'distribute', 'wheel')
+DEV_PKGS = {'pip', 'setuptools', 'distribute', 'wheel'}
 
 
 class FreezeCommand(Command):

pip/commands/freeze.py

@@ -4,8 +4,9 @@
 import sys
 import textwrap
 
+from collections import OrderedDict
+
 from pip.basecommand import Command, SUCCESS
-from pip.compat import OrderedDict
 from pip.download import PipXmlrpcTransport
 from pip.models import PyPI
 from pip.utils import get_terminal_size

pip/commands/search.py

@@ -7,16 +7,6 @@
 
 from pip._vendor.six import text_type
 
-try:
-    from logging.config import dictConfig as logging_dictConfig
-except ImportError:
-    from pip.compat.dictconfig import dictConfig as logging_dictConfig
-
-try:
-    from collections import OrderedDict
-except ImportError:
-    from pip._vendor.ordereddict import OrderedDict
-
 try:
     import ipaddress
 except ImportError:
@@ -28,30 +18,9 @@
         ipaddress.ip_network = ipaddress.IPNetwork
 
 
-try:
-    import sysconfig
-
-    def get_stdlib():
-        paths = [
-            sysconfig.get_path("stdlib"),
-            sysconfig.get_path("platstdlib"),
-        ]
-        return set(filter(bool, paths))
-except ImportError:
-    from distutils import sysconfig
-
-    def get_stdlib():
-        paths = [
-            sysconfig.get_python_lib(standard_lib=True),
-            sysconfig.get_python_lib(standard_lib=True, plat_specific=True),
-        ]
-        return set(filter(bool, paths))
-
-
 __all__ = [
-    "logging_dictConfig", "ipaddress", "uses_pycache", "console_to_str",
-    "native_str", "get_path_uid", "stdlib_pkgs", "WINDOWS", "samefile",
-    "OrderedDict",
+    "ipaddress", "uses_pycache", "console_to_str", "native_str",
+    "get_path_uid", "stdlib_pkgs", "WINDOWS", "samefile",
 ]
 
 
@@ -90,14 +59,6 @@ def native_str(s, replace=False):
         return s
 
 
-def total_seconds(td):
-    if hasattr(td, "total_seconds"):
-        return td.total_seconds()
-    else:
-        val = td.microseconds + (td.seconds + td.days * 24 * 3600) * 10 ** 6
-        return val / 10 ** 6
-
-
 def get_path_uid(path):
     """
     Return path's uid.
@@ -144,9 +105,7 @@ def expanduser(path):
 # dist.location (py27:`sysconfig.get_paths()['stdlib']`,
 # py26:sysconfig.get_config_vars('LIBDEST')), but fear platform variation may
 # make this ineffective, so hard-coding
-stdlib_pkgs = ('python', 'wsgiref')
-if sys.version_info >= (2, 7):
-    stdlib_pkgs += ('argparse',)
+stdlib_pkgs = {"python", "wsgiref", "argparse"}
 
 
 # windows detection, covers cpython and ironpython