summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-12-08 12:54:34 +0100
committerSebastian Thiel <byronimo@gmail.com>2016-12-08 12:54:34 +0100
commitb06b13e61e8db81afdd666ac68f4a489cec87d5a (patch)
tree05754ea627d77922c4ffcd3141bf5dc567dfcd3e
parentb93ba7ca6913ce7f29e118fd573f6ed95808912b (diff)
downloadgitpython-b06b13e61e8db81afdd666ac68f4a489cec87d5a.tar.gz
chore(lint): flake8
Interestingly only shows in particular python versions on travis. Maybe some caching effect? Locally it is reproducible easily, with the latest flake8
-rw-r--r--git/cmd.py1
-rw-r--r--git/objects/submodule/root.py2
-rw-r--r--git/test/test_submodule.py2
-rw-r--r--git/util.py1
-rwxr-xr-xsetup.py1
5 files changed, 5 insertions, 2 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 72ba82c3..71c9e5a0 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -135,6 +135,7 @@ def dict_to_slots_and__excluded_are_none(self, d, excluded=()):
## -- End Utilities -- @}
+
# value of Windows process creation flag taken from MSDN
CREATE_NO_WINDOW = 0x08000000
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py
index 4fe856c2..fbd658d7 100644
--- a/git/objects/submodule/root.py
+++ b/git/objects/submodule/root.py
@@ -17,7 +17,6 @@ log.addHandler(logging.NullHandler())
class RootUpdateProgress(UpdateProgress):
-
"""Utility class which adds more opcodes to the UpdateProgress"""
REMOVE, PATHCHANGE, BRANCHCHANGE, URLCHANGE = [
1 << x for x in range(UpdateProgress._num_op_codes, UpdateProgress._num_op_codes + 4)]
@@ -25,6 +24,7 @@ class RootUpdateProgress(UpdateProgress):
__slots__ = tuple()
+
BEGIN = RootUpdateProgress.BEGIN
END = RootUpdateProgress.END
REMOVE = RootUpdateProgress.REMOVE
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index 7b05f49a..95441813 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -29,12 +29,12 @@ import os.path as osp
class TestRootProgress(RootUpdateProgress):
-
"""Just prints messages, for now without checking the correctness of the states"""
def update(self, op, cur_count, max_count, message=''):
print(op, cur_count, max_count, message)
+
prog = TestRootProgress()
diff --git a/git/util.py b/git/util.py
index 1e0d3eb4..ef7e2b7c 100644
--- a/git/util.py
+++ b/git/util.py
@@ -940,6 +940,7 @@ class NullHandler(logging.Handler):
def emit(self, record):
pass
+
# In Python 2.6, there is no NullHandler yet. Let's monkey-patch it for a workaround.
if not hasattr(logging, 'NullHandler'):
logging.NullHandler = NullHandler
diff --git a/setup.py b/setup.py
index cbf5cf57..ea1b6316 100755
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ def _stamp_version(filename):
else:
print("WARNING: Couldn't find version line in file %s" % filename, file=sys.stderr)
+
install_requires = ['gitdb2 >= 2.0.0']
extras_require = {
':python_version == "2.6"': ['ordereddict'],