Drop support for EOL Python 2.6

Author: hugovk

.appveyor.yml

@@ -7,9 +7,6 @@ environment:
     matrix:
         ## MINGW
         #
-      - PYTHON: "C:\\Python26"
-        PYTHON_VERSION: "2.6"
-        GIT_PATH: "%GIT_DAEMON_PATH%"
       - PYTHON: "C:\\Python27"
         PYTHON_VERSION: "2.7"
         GIT_PATH: "%GIT_DAEMON_PATH%"

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"
@@ -12,7 +11,6 @@ python:
   # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
 matrix:
   allow_failures:
-    - python: "2.6"
     - python: "3.6-dev"
     - python: "3.7-dev"
     - python: "nightly"
@@ -26,7 +24,6 @@ install:
   - git fetch --tags
   - pip install -r test-requirements.txt
   - pip install codecov sphinx
-  - if [ "$TRAVIS_PYTHON_VERSION" == '2.6' ]; then pip install unittest2; fi
 
   # generate some reflog as git-python tests need it (in master)
   - ./init-tests-after-clone.sh

README.md

@@ -19,7 +19,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting
 the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable.
 
 * Git (1.7.x or newer)
-* Python 2.7 to 3.6, while python 2.6 is supported on a *best-effort basis*.
+* Python 2.7 to 3.6.
 
 The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`.
 The installer takes care of installing them for you.
@@ -68,10 +68,6 @@ For *Windows*, we do regularly test it on [Appveyor CI](https://www.appveyor.com
 but not all test-cases pass - you may help improve them by exploring
 [Issue #525](https://github.com/gitpython-developers/GitPython/issues/525).
 
-#### Python 2.6
-
-Python 2.6 is supported on best-effort basis; which means that it is likely to deteriorate over time.
-
 ### RUNNING TESTS
 
 *Important*: Right after cloning this repository, please be sure to have executed

doc/source/intro.rst

@@ -14,8 +14,6 @@ Requirements
 ============
 
 * `Python`_ 2.7 or newer
-    Since GitPython 2.0.0. Please note that python 2.6 is still reasonably well supported, but might
-    deteriorate over time. Support is provided on a best-effort basis only.
 * `Git`_ 1.7.0 or newer
     It should also work with older versions, but it may be that some operations
     involving remotes will not work as expected.
@@ -75,12 +73,6 @@ codebase for `__del__` implementations and call these yourself when you see fit.
 Another way assure proper cleanup of resources is to factor out GitPython into a
 separate process which can be dropped periodically.
 
-Best-effort for Python 2.6 and Windows support
-----------------------------------------------
-
-This means that support for these platforms is likely to worsen over time
-as they are kept alive solely by their users, or not.
-
 Getting Started
 ===============
 
@@ -124,7 +116,7 @@ http://stackoverflow.com/questions/tagged/gitpython
 
 Issue Tracker
 =============
-The issue tracker is hosted by github:
+The issue tracker is hosted by GitHub:
 
 https://github.com/gitpython-developers/GitPython/issues
 

git/cmd.py

@@ -17,6 +17,7 @@
 import subprocess
 import sys
 import threading
+from collections import OrderedDict
 from textwrap import dedent
 
 from git.compat import (
@@ -31,7 +32,6 @@
     is_win,
 )
 from git.exc import CommandError
-from git.odict import OrderedDict
 from git.util import is_cygwin_git, cygpath, expand_path
 
 from .exc import (
@@ -143,8 +143,7 @@ def dict_to_slots_and__excluded_are_none(self, d, excluded=()):
 ## CREATE_NEW_PROCESS_GROUP is needed to allow killing it afterwards,
 # see https://docs.python.org/3/library/subprocess.html#subprocess.Popen.send_signal
 PROC_CREATIONFLAGS = (CREATE_NO_WINDOW | subprocess.CREATE_NEW_PROCESS_GROUP
-                      if is_win and sys.version_info >= (2, 7)
-                      else 0)
+                      if is_win else 0)
 
 
 class Git(LazyMixin):

git/config.py

@@ -12,6 +12,7 @@
 import logging
 import os
 import re
+from collections import OrderedDict
 
 from git.compat import (
     string_types,
@@ -21,7 +22,6 @@
     with_metaclass,
     PY3
 )
-from git.odict import OrderedDict
 from git.util import LockFile
 
 import os.path as osp

git/objects/submodule/base.py

@@ -3,10 +3,7 @@
 import logging
 import os
 import stat
-try:
-    from unittest import SkipTest
-except ImportError:
-    from unittest2 import SkipTest
+from unittest import SkipTest
 import uuid
 
 import git

git/odict.py

@@ -15,6 +15,7 @@
 import tempfile
 import textwrap
 import time
+import unittest
 
 from git.compat import string_types, is_win
 from git.util import rmtree, cwd
@@ -23,11 +24,6 @@
 import os.path as osp
 
 
-if sys.version_info[0:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 TestCase = unittest.TestCase
 SkipTest = unittest.SkipTest
 skipIf = unittest.skipIf
@@ -348,7 +344,6 @@ class TestBase(TestCase):
       of the project history ( to assure tests don't fail for others ).
     """
 
-    # On py26, unittest2 has assertRaisesRegex
     # On py3, unittest has assertRaisesRegex
     # On py27, we use unittest, which names it differently:
     if sys.version_info[0:2] == (2, 7):

git/test/lib/helper.py

@@ -7,10 +7,7 @@
 import os
 import sys
 import tempfile
-try:
-    from unittest import SkipTest, skipIf
-except ImportError:
-    from unittest2 import SkipTest, skipIf
+from unittest import SkipTest, skipIf
 
 from git import (
     Blob,

git/test/test_base.py

@@ -2,11 +2,7 @@
 from stat import S_IFDIR, S_IFREG, S_IFLNK
 from os import stat
 import os.path as osp
-
-try:
-    from unittest import skipIf, SkipTest
-except ImportError:
-    from unittest2 import skipIf, SkipTest
+from unittest import skipIf, SkipTest
 
 from git import Git
 from git.compat import PY3

git/test/test_fun.py

@@ -11,12 +11,8 @@
     S_ISLNK,
     ST_MODE
 )
-import sys
 import tempfile
-try:
-    from unittest import skipIf
-except ImportError:
-    from unittest2 import skipIf
+from unittest import skipIf
 
 from git import (
     IndexFile,
@@ -168,9 +164,7 @@ def add_bad_blob():
         except Exception as ex:
             msg_py3 = "required argument is not an integer"
             msg_py2 = "cannot convert argument to integer"
-            msg_py26 = "unsupported operand type(s) for &: 'str' and 'long'"
-            assert msg_py2 in str(ex) or msg_py3 in str(ex) or \
-                msg_py26 in str(ex), str(ex)
+            assert msg_py2 in str(ex) or msg_py3 in str(ex)
 
         ## 2nd time should not fail due to stray lock file
         try:
@@ -180,9 +174,6 @@ def add_bad_blob():
 
     @with_rw_repo('0.1.6')
     def test_index_file_from_tree(self, rw_repo):
-        if sys.version_info < (2, 7):
-            ## Skipped, not `assertRaisesRegexp` in py2.6
-            return
         common_ancestor_sha = "5117c9c8a4d3af19a9958677e45cda9269de1541"
         cur_sha = "4b43ca7ff72d5f535134241e7c797ddc9c7a3573"
         other_sha = "39f85c4358b7346fee22169da9cad93901ea9eb9"

git/test/test_index.py

@@ -6,10 +6,7 @@
 
 import random
 import tempfile
-try:
-    from unittest import skipIf
-except ImportError:
-    from unittest2 import skipIf
+from unittest import skipIf
 
 from git import (
     RemoteProgress,

git/test/test_remote.py

@@ -9,12 +9,8 @@
 import itertools
 import os
 import pickle
-import sys
 import tempfile
-try:
-    from unittest import skipIf, SkipTest
-except ImportError:
-    from unittest2 import skipIf, SkipTest
+from unittest import skipIf, SkipTest
 
 try:
     import pathlib
@@ -364,9 +360,6 @@ def test_archive(self):
 
     @patch.object(Git, '_call_process')
     def test_should_display_blame_information(self, git):
-        if sys.version_info < (2, 7):
-            ## Skipped, not `assertRaisesRegexp` in py2.6
-            return
         git.return_value = fixture('blame')
         b = self.rorepo.blame('master', 'lib/git.py')
         assert_equal(13, len(b))
@@ -792,8 +785,6 @@ def test_rev_parse(self):
 
     def test_repo_odbtype(self):
         target_type = GitCmdObjectDB
-        if sys.version_info[:2] < (2, 5):
-            target_type = GitCmdObjectDB
         self.assertIsInstance(self.rorepo.odb, target_type)
 
     def test_submodules(self):

git/test/test_repo.py

@@ -3,10 +3,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import os
 import sys
-try:
-    from unittest import skipIf
-except ImportError:
-    from unittest2 import skipIf
+from unittest import skipIf
 
 import git
 from git.cmd import Git

git/test/test_submodule.py

@@ -6,10 +6,7 @@
 
 from io import BytesIO
 import sys
-try:
-    from unittest import skipIf
-except ImportError:
-    from unittest2 import skipIf
+from unittest import skipIf
 
 from git import (
     Tree,

git/test/test_tree.py

@@ -6,10 +6,7 @@
 
 import tempfile
 import time
-try:
-    from unittest import skipIf
-except ImportError:
-    from unittest2 import skipIf
+from unittest import skipIf
 
 
 import ddt

git/test/test_util.py

@@ -14,10 +14,7 @@
 import shutil
 import stat
 import time
-try:
-    from unittest import SkipTest
-except ImportError:
-    from unittest2 import SkipTest
+from unittest import SkipTest
 
 from gitdb.util import (# NOQA @IgnorePep8
     make_sha,

git/util.py

@@ -1,3 +1,2 @@
 gitdb>=0.6.4
 ddt>=1.1.1
-unittest2; python_version < '2.7'

requirements.txt

@@ -9,8 +9,6 @@
 
 from distutils.command.build_py import build_py as _build_py
 from setuptools.command.sdist import sdist as _sdist
-import pkg_resources
-import logging
 import os
 import sys
 from os import path
@@ -66,26 +64,7 @@ def _stamp_version(filename):
 
 
 install_requires = ['gitdb2 >= 2.0.0']
-extras_require = {
-    ':python_version == "2.6"': ['ordereddict'],
-}
 test_requires = ['ddt>=1.1.1']
-if sys.version_info[:2] < (2, 7):
-    test_requires.append('mock')
-
-try:
-    if 'bdist_wheel' not in sys.argv:
-        for key, value in extras_require.items():
-            if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]):
-                install_requires.extend(value)
-except Exception:
-    logging.getLogger(__name__).exception(
-        'Something went wrong calculating platform specific dependencies, so '
-        "you're getting them all!"
-    )
-    for key, value in extras_require.items():
-        if key.startswith(':'):
-            install_requires.extend(value)
 # end
 
 setup(
@@ -101,7 +80,7 @@ def _stamp_version(filename):
     package_data={'git.test': ['fixtures/*']},
     package_dir={'git': 'git'},
     license="BSD License",
-    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
     requires=['gitdb2 (>=2.0.0)'],
     install_requires=install_requires,
     test_requirements=test_requires + install_requires,
@@ -126,7 +105,6 @@ def _stamp_version(filename):
         "Operating System :: MacOS :: MacOS X",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",

setup.py

@@ -3,4 +3,4 @@
 coverage
 flake8
 nose
-mock; python_version<='2.7'
+mock; python_version=='2.7'