Enclosed a simple diff for updating git-cola to 3.7. Changes:
https://github.com/git-cola/git-cola/blob/v3.7/CHANGES.rst
'make test' runs successfully. Run tested on amd64.
Comments/OK?
diff --git devel/git-cola/Makefile devel/git-cola/Makefile
index 85b533ee192..4d1d9d12d01 100644
--- devel/git-cola/Makefile
+++ devel/git-cola/Makefile
@@ -2,8 +2,7 @@
COMMENT = python powered git gui
-MODPY_EGG_VERSION= 3.6
-REVISION = 0
+MODPY_EGG_VERSION= 3.7
GH_ACCOUNT = git-cola
GH_PROJECT = git-cola
diff --git devel/git-cola/distinfo devel/git-cola/distinfo
index 14b6faa2dff..0843017c618 100644
--- devel/git-cola/distinfo
+++ devel/git-cola/distinfo
@@ -1,2 +1,2 @@
-SHA256 (git-cola-3.6.tar.gz) = YzafUZ+BmIwtFnuixZrVNkTT+sK3vh4S0/Hfm4/ZGDk=
-SIZE (git-cola-3.6.tar.gz) = 967745
+SHA256 (git-cola-3.7.tar.gz) = mhQnsFwQfsgzeIHtaLtFCsBAoIiA+R3LdwWI91XW/Rs=
+SIZE (git-cola-3.7.tar.gz) = 968501
diff --git devel/git-cola/patches/patch-Makefile
devel/git-cola/patches/patch-Makefile
index 79ca0e1a2c6..5931022acf6 100644
--- devel/git-cola/patches/patch-Makefile
+++ devel/git-cola/patches/patch-Makefile
@@ -8,8 +8,8 @@ code is not used when running git-cola on OpenBSD.
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -72,7 +72,7 @@ FLAKE8_FLAGS += --format=pylint
- FLAKE8_FLAGS += --doctests
+@@ -71,7 +71,7 @@ endif
+ FLAKE8_FLAGS = $(VERBOSE)
PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE)
-PYTEST_FLAGS += --doctest-modules
diff --git devel/git-cola/patches/patch-cola_app_py
devel/git-cola/patches/patch-cola_app_py
index 5d63bd8e245..1e0da62b596 100644
--- devel/git-cola/patches/patch-cola_app_py
+++ devel/git-cola/patches/patch-cola_app_py
@@ -5,7 +5,7 @@ Use ssh-askpass implementation from xenocara.
Index: cola/app.py
--- cola/app.py.orig
+++ cola/app.py
-@@ -98,7 +98,7 @@ def setup_environment():
+@@ -101,7 +101,7 @@ def setup_environment():
elif sys.platform == 'darwin':
askpass = resources.share('bin', 'ssh-askpass-darwin')
else:
