Revert "This time, use test-requirements." · gitpython-developers/GitPython@c9dbaab (original) (raw)

4 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ install:
22 22 - python --version; git --version
23 23 - git submodule update --init --recursive
24 24 - git fetch --tags
25 - - pip install -r requirements.txt
26 25 - pip install -r test-requirements.txt
27 26 - pip install codecov sphinx
28 27
Original file line number Diff line number Diff line change
@@ -30,10 +30,7 @@
30 30 is_win = (os.name == 'nt')
31 31 is_posix = (os.name == 'posix')
32 32 is_darwin = (os.name == 'darwin')
33 -if hasattr(sys, 'getfilesystemencoding'):
34 -defenc = sys.getfilesystemencoding()
35 -if defenc is None:
36 -defenc = sys.getdefaultencoding()
33 +defenc = sys.getdefaultencoding()
37 34
38 35 if PY3:
39 36 import io
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
4 4 # This module is part of GitPython and is released under
5 5 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
6 6
7 -from builtins import str
8 7 from collections import namedtuple
9 8 import logging
10 9 import os
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
1 1 gitdb2 (>=2.0.0)
2 -gitdb>=0.6.4
3 -ddt>=1.1.1
4 -future>=0.9