py-git: update to 2.1.7

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Sep 29 11:50:48 2017 +0200
Changeset:	2dfca5b77fbcaa7532692130238208d16f3fb6b4

Modified Files:
	py-django-gitrevision/Makefile
	py-git/Makefile
	py-git/PLIST
	py-git/distinfo
	py-opentmm/Makefile

Log Message:
py-git: update to 2.1.7

2.1.6 - Bugfixes

    support for worktrees

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2dfca5b77fbcaa7532692130238208d16f3fb6b4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-django-gitrevision/Makefile |  2 --
 py-git/Makefile                | 13 +++++++------
 py-git/PLIST                   |  5 +++++
 py-git/distinfo                |  8 ++++----
 py-opentmm/Makefile            |  3 ---
 5 files changed, 16 insertions(+), 15 deletions(-)

diffs:
diff --git a/py-django-gitrevision/Makefile b/py-django-gitrevision/Makefile
index 542402773f..612f195868 100644
--- a/py-django-gitrevision/Makefile
+++ b/py-django-gitrevision/Makefile
@@ -14,8 +14,6 @@ LICENSE=	gnu-lgpl-v2.1
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 DEPENDS+=	${PYPKGPREFIX}-git-[0-9]*:../../wip/py-git
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-git
-
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
diff --git a/py-git/Makefile b/py-git/Makefile
index 2a1a504c0d..96fcb75c26 100644
--- a/py-git/Makefile
+++ b/py-git/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2014/12/31 13:58:32 thomasklausner Exp $
 
-DISTNAME=	GitPython-2.0.8
+DISTNAME=	GitPython-2.1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/GitPython/git/}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=G/GitPython/}
@@ -10,16 +10,17 @@ HOMEPAGE=	https://github.com/gitpython-developers/GitPython
 COMMENT=	Python library used to interact with Git repositories
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-smmap>=0.8.5:../../wip/py-smmap
-DEPENDS+=	${PYPKGPREFIX}-gitdb>=0.6.1:../../wip/py-gitdb
-DEPENDS+=	git>=1.7.0:../../devel/git
+DEPENDS+=	${PYPKGPREFIX}-smmap2-[0-9]*:../../wip/py-smmap2
+DEPENDS+=	${PYPKGPREFIX}-gitdb2-[0-9]*:../../wip/py-gitdb2
+DEPENDS+=	git-base>=1.7.0:../../devel/git-base
 
+# major test failures as of 2.1.7
+# https://github.com/gitpython-developers/GitPython/issues/673
 # TEST_DEPENDS
+BUILD_DEPENDS+=	${PYPKGPREFIX}-ddt-[0-9]*:../../devel/py-ddt
 BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
-#PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.3.2.RC1
-
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
diff --git a/py-git/PLIST b/py-git/PLIST
index 9eff2e368c..d0957e1af8 100644
--- a/py-git/PLIST
+++ b/py-git/PLIST
@@ -120,6 +120,7 @@ ${PYSITELIB}/git/test/fixtures/blame
 ${PYSITELIB}/git/test/fixtures/blame_binary
 ${PYSITELIB}/git/test/fixtures/blame_complex_revision
 ${PYSITELIB}/git/test/fixtures/blame_incremental
+${PYSITELIB}/git/test/fixtures/blame_incremental_2.11.1_plus
 ${PYSITELIB}/git/test/fixtures/cat_file.py
 ${PYSITELIB}/git/test/fixtures/cat_file.pyc
 ${PYSITELIB}/git/test/fixtures/cat_file.pyo
@@ -159,6 +160,7 @@ ${PYSITELIB}/git/test/fixtures/issue-301_stderr
 ${PYSITELIB}/git/test/fixtures/ls_tree_a
 ${PYSITELIB}/git/test/fixtures/ls_tree_b
 ${PYSITELIB}/git/test/fixtures/ls_tree_commit
+${PYSITELIB}/git/test/fixtures/ls_tree_empty
 ${PYSITELIB}/git/test/fixtures/reflog_HEAD
 ${PYSITELIB}/git/test/fixtures/reflog_invalid_date
 ${PYSITELIB}/git/test/fixtures/reflog_invalid_email
@@ -227,6 +229,9 @@ ${PYSITELIB}/git/test/test_diff.pyo
 ${PYSITELIB}/git/test/test_docs.py
 ${PYSITELIB}/git/test/test_docs.pyc
 ${PYSITELIB}/git/test/test_docs.pyo
+${PYSITELIB}/git/test/test_exc.py
+${PYSITELIB}/git/test/test_exc.pyc
+${PYSITELIB}/git/test/test_exc.pyo
 ${PYSITELIB}/git/test/test_fun.py
 ${PYSITELIB}/git/test/test_fun.pyc
 ${PYSITELIB}/git/test/test_fun.pyo
diff --git a/py-git/distinfo b/py-git/distinfo
index 314e5432f1..ff386d803f 100644
--- a/py-git/distinfo
+++ b/py-git/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.1.1.1 2012/01/06 11:19:04 jihbed Exp $
 
-SHA1 (GitPython-2.0.8.tar.gz) = 6104c4e3ea13c3ba8cf4ddda0ea1c726156aa0bb
-RMD160 (GitPython-2.0.8.tar.gz) = cf7f0a3abe84a9d905f412ba72b242970fe2d684
-SHA512 (GitPython-2.0.8.tar.gz) = 8a4bfce39d28e0872189d71900e73b2ab51bf7488539fafe3d45f4e1900b4af014b7bd7f73b44e7cfa38341ee113f37e4c5680d0b98b68fc3af6f287f4d859fd
-Size (GitPython-2.0.8.tar.gz) = 407438 bytes
+SHA1 (GitPython-2.1.7.tar.gz) = 60c5ffd02e558dcefcaad13d652340021c192d1b
+RMD160 (GitPython-2.1.7.tar.gz) = 682a6c10b538ed86f8d2ea35fc9cecac2c29454b
+SHA512 (GitPython-2.1.7.tar.gz) = 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
+Size (GitPython-2.1.7.tar.gz) = 426362 bytes
diff --git a/py-opentmm/Makefile b/py-opentmm/Makefile
index d468de9844..e005750426 100644
--- a/py-opentmm/Makefile
+++ b/py-opentmm/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.4 2014/12/31 13:58:35 thomasklausner Exp $
-#
 
 DISTNAME=	openTMM-0.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,8 +13,6 @@ LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 #DEPENDS+=	${PYPKGPREFIX}-django-gitrevision>=0.1.4:../../wip/py-django-gitrevision
 
-#PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-git via py-django-gitrevision
-
 USE_LANGUAGES=	c fortran
 
 .include "../../math/py-numpy/buildlink3.mk"