deskutils/py-bugwarrior: Update to 1.7.0

Changelog:

  https://github.com/ralphbean/bugwarrior/blob/1.7.0/CHANGELOG.rst

3 files changed, 30 insertions, 37 deletions

diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index b12aa5569f15..3027de1fb39f 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugwarrior
-PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTVERSION=	1.7.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,26 +13,36 @@ COMMENT=	Sync issue & bug tracking systems with taskwarrior
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
+#		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR}		
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+OPTIONS_GROUP=		GENERAL SERVICES
+OPTIONS_GROUP_GENERAL=	KEYRING
+OPTIONS_GROUP_SERVICES=	BUGZILLA JIRA PHABRICATOR TRAC
 
-OPTIONS_DEFINE=		BUGZILLA JIRA PHABRICATOR
-OPTIONS_DEFAULT=	BUGZILLA JIRA PHABRICATOR
+OPTIONS_DEFAULT=	KEYRING BUGZILLA JIRA PHABRICATOR TRAC
+
+GENERAL_DESC=		General Options
+SERVICES_DESC=		Third Party Services
+
+KEYRING_DESC=		Enable keyring (password) support
+KEYRING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR}
 
 BUGZILLA_DESC=			Enable Bugzilla support
 BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${PY_FLAVOR}
@@ -47,9 +56,6 @@ PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricat
 TRAC_DESC=			Enable Trac support
 TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${PY_FLAVOR}
 
-USES=		python:-2.7
-USE_PYTHON=	autoplist concurrent distutils
-
 do-test:
 	${RM} ${WRKSRC}/tests/test_activecollab.py # Needs pandoc
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/deskutils/py-bugwarrior/distinfo b/deskutils/py-bugwarrior/distinfo
index 5079eb5f9fc3..368332d4918e 100644
--- a/deskutils/py-bugwarrior/distinfo
+++ b/deskutils/py-bugwarrior/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500319709
-SHA256 (bugwarrior-1.5.1.tar.gz) = ab03c3872e8f27f954b60bb6ff4f0646a2b7e2a7fb9c12116a90cdc297b4b34f
-SIZE (bugwarrior-1.5.1.tar.gz) = 188590
+TIMESTAMP = 1558498962
+SHA256 (bugwarrior-1.7.0.tar.gz) = 7ae2602cf178664d4fd9daa7877afdca2d07e9813e5c3095938df556d4b4bfde
+SIZE (bugwarrior-1.7.0.tar.gz) = 114000
diff --git a/deskutils/py-bugwarrior/files/patch-setup.py b/deskutils/py-bugwarrior/files/patch-setup.py
index 2cdb76446ea4..0ea9584e9f83 100644
--- a/deskutils/py-bugwarrior/files/patch-setup.py
+++ b/deskutils/py-bugwarrior/files/patch-setup.py
@@ -1,24 +1,11 @@
---- setup.py.orig	2017-05-25 15:38:59 UTC
+--- setup.py.orig	2019-05-22 04:44:47 UTC
 +++ setup.py
-@@ -38,7 +38,7 @@ setup(name='bugwarrior',
-           "dogpile.cache>=0.5.3",
-           "lockfile>=0.9.1",
-           "click",
--          "future!=0.16.0",
-+          "future",
-       ],
-       extras_require=dict(
-           keyring=["keyring", "dbus-python"],
-@@ -50,9 +50,11 @@ setup(name='bugwarrior',
-           bugzilla=["python-bugzilla"],
-       ),
-       tests_require=[
--          "Mock",
-+          "mock",
+@@ -54,6 +54,8 @@ setup(name='bugwarrior',
+           "Mock",
            "nose",
            "responses",
-+          "pypandoc",
-+          "pyac",
++           "pypandoc",
++           "pyac",
            "bugwarrior[jira]",
            "bugwarrior[megaplan]",
            "bugwarrior[activecollab]",