Bump GitPython to 2.1.8

Fixes gitpython-developers/GitPython#687

Author: LinuxMercedes

assigner/__init__.py

@@ -1,4 +1,15 @@
 #!/usr/bin/env python3
+
+# GitPython throws an ImportError now if git is not installed
+# unless the environment variable GIT_PYTHON_REFRESH is set.
+# We'll opt to keep going and handle the GitCommandNotFound
+# exception if it comes up.
+import os
+os.environ["GIT_PYTHON_REFRESH"] = "silence"
+
+# We *have* to set GIT_PYTHON_REFRESH before importing
+# anything that imports GitPython.
+# pylint: disable=wrong-import-position
 import argparse
 import importlib
 import logging

assigner/baserepo.py

@@ -206,7 +206,7 @@ def clone_to(self, dir_name, branch):
             else:
                 self._repo = git.Repo.clone_from(self.ssh_url, dir_name)
             logging.debug("Cloned %s.", self.name)
-        except git.exc.GitCommandError as e:
+        except git.GitCommandError as e:
             # GitPython may delete this directory
             # and the caller may have opinions about that,
             # so go ahead and re-create it just to be safe.

assigner/commands/get.py

@@ -2,7 +2,7 @@
 import os
 
 from requests.exceptions import HTTPError
-from git.exc import NoSuchPathError, GitCommandError
+from git import NoSuchPathError, GitCommandError
 
 from assigner.roster_util import get_filtered_roster
 from assigner.baserepo import RepoError, StudentRepo

assigner/tests/assigner_test.py

@@ -142,7 +142,7 @@ def test_main_logs_gitcommandnotfound_with_catch(self, mock_logger):
         main should log a GitCommandNotFound with "git is not installed!" when raised.
         """
         self.mock_args.tracebacks = False
-        self.mock_args.run.side_effect = GitCommandNotFound()
+        self.mock_args.run.side_effect = GitCommandNotFound("git", "not found")
         try:
             main([])
         except SystemExit:

requirements.txt

@@ -1,4 +1,4 @@
-GitPython==1.0.1
+GitPython==2.1.8
 PyYAML==3.11
 colorlog==2.6.0
 gitdb==0.6.4

setup.py

@@ -72,7 +72,7 @@
     # Any package you put here will be installed by pip when your project is
     # installed, so they must be valid existing projects.
     install_requires=[
-        'GitPython>=1',
+        'GitPython>=2.1.8',
         'PyYAML>=3.11',
         'colorlog>=2.6,<3', # TODO can we move to v3?
         'jsonschema>=2.5',