Index: head/devel/py-python-gitlab/Makefile
===================================================================
--- head/devel/py-python-gitlab/Makefile	(revision 535189)
+++ head/devel/py-python-gitlab/Makefile	(revision 535190)
@@ -1,45 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	python-gitlab
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Interact with GitLab API
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.2:www/py-requests@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httmock>0:www/py-httmock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 
-#OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=	AUTOCOMPLETE YAML
+OPTIONS_DEFINE=	AUTOCOMPLETE DOCS YAML
 
-#DOCS_BUILD_DEPENDS=	${PY_SPHINX}
-#DOCS_PORTDOCS=	*
-#DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
+AUTOCOMPLETE_DESC=	Autocompletion via argcomplete
+AUTOCOMPLETE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<2:devel/py-argcomplete@${PY_FLAVOR}
+
+DOCS_BUILD_DEPENDS=	${PY_SPHINX} \
+		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
+DOCS_PORTDOCS=	*
+DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
 		PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
 
+YAML_DESC=	YAML output
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
+
 NO_ARCH=	yes
 USE_PYTHON=	distutils autoplist concurrent
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
 
 do-test:
-	cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
 .include <bsd.port.mk>
Index: head/devel/py-python-gitlab/distinfo
===================================================================
--- head/devel/py-python-gitlab/distinfo	(revision 535189)
+++ head/devel/py-python-gitlab/distinfo	(revision 535190)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583781834
-SHA256 (python-gitlab-2.1.2.tar.gz) = 71445d7444fe3354bf90a52d6249f91c9e572a8ef6c143afd9de25f50c92d499
-SIZE (python-gitlab-2.1.2.tar.gz) = 129023
+TIMESTAMP = 1589406122
+SHA256 (python-gitlab-2.2.0.tar.gz) = 4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2
+SIZE (python-gitlab-2.2.0.tar.gz) = 136178