diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,10 @@
language: python
python:
-  - "2.6"
  - "2.7"
  - "3.3"
  - "3.4"
  - "3.5"
  # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
-matrix:
-  allow_failures:
-    - python: "2.6"
git:
  # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
  # as we clone our own repository in the process
@@ -17,7 +13,8 @@ install:
  - python --version; git --version
  - git submodule update --init --recursive
  - git fetch --tags
-  - pip install codecov flake8 ddt sphinx

  # generate some reflog as git-python tests need it (in master)
  - ./init-tests-after-clone.sh

diff --git a/git/config.py b/git/config.py
@@ -6,21 +6,13 @@
"""Module containing module parser implementation able to properly read and write
configuration files"""

-import re
-try:
-    import ConfigParser as cp
-except ImportError:
-    # PY3
-    import configparser as cp
import inspect
import logging
-import abc
import os

-from functools import wraps
-
-from git.odict import OrderedDict
-from git.util import LockFile
from git.compat import (
    string_types,
    FileType,
@@ -29,6 +21,18 @@
    with_metaclass,
    PY3
)

__all__ = ('GitConfigParser', 'SectionConstraint')

@@ -408,15 +412,15 @@ def read(self):
            if self._has_includes():
                for _, include_path in self.items('include'):
                    if include_path.startswith('~'):
-                        include_path = os.path.expanduser(include_path)
-                    if not os.path.isabs(include_path):
                        if not file_ok:
                            continue
                        # end ignore relative paths if we don't know the configuration file path
-                        assert os.path.isabs(file_path), "Need absolute paths to be sure our cycle checks will work"
-                        include_path = os.path.join(os.path.dirname(file_path), include_path)
                    # end make include path absolute
-                    include_path = os.path.normpath(include_path)
                    if include_path in seen or not os.access(include_path, os.R_OK):
                        continue
                    seen.add(include_path)

diff --git a/git/db.py b/git/db.py
@@ -1,12 +1,9 @@
"""Module with our own gitdb implementation - it uses the git command"""
from gitdb.base import (
    OInfo,
    OStream
)
-from gitdb.util import (
-    bin_to_hex,
-    hex_to_bin
-)
from gitdb.db import GitDB  # @UnusedImport
from gitdb.db import LooseObjectDB


diff --git a/git/diff.py b/git/diff.py
@@ -5,18 +5,17 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import re

-from gitdb.util import hex_to_bin

from .compat import binary_type
from .objects.blob import Blob
from .objects.util import mode_str_to_int

-from git.compat import (
-    defenc,
-    PY3
-)
-from git.cmd import handle_process_output
-from git.util import finalize_process

__all__ = ('Diffable', 'DiffIndex', 'Diff', 'NULL_TREE')


diff --git a/git/ext/gitdb b/git/ext/gitdb
+0 −7		README.rst
+1 −1		gitdb/__init__.py
+1,154 −0		gitdb/_delta_apply.c
+6 −0		gitdb/_delta_apply.h
+107 −0		gitdb/_fun.c
+1 −1		gitdb/ext/smmap
+1 −1		gitdb/fun.py
+1 −1		gitdb/pack.py
+1 −1		gitdb/stream.py
+118 −38		setup.py