diff options
| author | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-20 15:33:28 +0800 |
|---|---|---|
| committer | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-20 15:34:18 +0800 |
| commit | 74a0507f4eb468b842d1f644f0e43196cda290a1 (patch) | |
| tree | 80bb820ffa088a42e6d05cf6f7cdfbbaa5da06fe | |
| parent | cc664f07535e3b3c1884d0b7f3cbcbadf9adce25 (diff) | |
| download | gitpython-74a0507f4eb468b842d1f644f0e43196cda290a1.tar.gz | |
This time, use test-requirements.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | git/compat.py | 5 | ||||
| -rw-r--r-- | git/repo/base.py | 1 | ||||
| -rw-r--r-- | requirements.txt | 3 |
4 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index aed714af..7116d720 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ install: - python --version; git --version - git submodule update --init --recursive - git fetch --tags + - pip install -r requirements.txt - pip install -r test-requirements.txt - pip install codecov sphinx diff --git a/git/compat.py b/git/compat.py index b63768f3..02dc69de 100644 --- a/git/compat.py +++ b/git/compat.py @@ -30,7 +30,10 @@ PY3 = sys.version_info[0] >= 3 is_win = (os.name == 'nt') is_posix = (os.name == 'posix') is_darwin = (os.name == 'darwin') -defenc = sys.getdefaultencoding() +if hasattr(sys, 'getfilesystemencoding'): + defenc = sys.getfilesystemencoding() +if defenc is None: + defenc = sys.getdefaultencoding() if PY3: import io diff --git a/git/repo/base.py b/git/repo/base.py index f3587080..911494ad 100644 --- a/git/repo/base.py +++ b/git/repo/base.py @@ -4,6 +4,7 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php +from builtins import str from collections import namedtuple import logging import os diff --git a/requirements.txt b/requirements.txt index 63d5ddfe..eacd5f54 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,4 @@ gitdb2 (>=2.0.0) +gitdb>=0.6.4 +ddt>=1.1.1 +future>=0.9 |