Index: head/www/py-gandi.cli/Makefile
===================================================================
--- head/www/py-gandi.cli/Makefile	(revision 501870)
+++ head/www/py-gandi.cli/Makefile	(revision 501871)
@@ -1,38 +1,37 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gandi.cli
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Gandi command line interface
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 # Actually 2.6-3.6(+)
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 .endif
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.post.mk>
Index: head/www/py-gandi.cli/distinfo
===================================================================
--- head/www/py-gandi.cli/distinfo	(revision 501870)
+++ head/www/py-gandi.cli/distinfo	(revision 501871)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533616050
-SHA256 (gandi.cli-1.2.tar.gz) = 51b5287a285bf665446d7ff47ed9cb447caa79ab8504d29e4212ae825e27086e
-SIZE (gandi.cli-1.2.tar.gz) = 159352
+TIMESTAMP = 1558097092
+SHA256 (gandi.cli-1.5.tar.gz) = a575be04fd373d4798ae16f6cbe03e8ed16255043788fb3de13bebfe7e621c84
+SIZE (gandi.cli-1.5.tar.gz) = 179987
Index: head/www/py-gandi.cli/files/patch-setup.cfg
===================================================================
--- head/www/py-gandi.cli/files/patch-setup.cfg	(nonexistent)
+++ head/www/py-gandi.cli/files/patch-setup.cfg	(revision 501871)
@@ -0,0 +1,12 @@
+--- setup.cfg.orig	2019-05-17 13:01:03 UTC
++++ setup.cfg
+@@ -5,9 +5,6 @@ cover-package = gandi.cli
+ with-coverage = 1
+ cover-erase = 1
+ 
+-[tool:pytest]
+-addopts = --cov=gandi.cli
+-
+ [egg_info]
+ tag_build = 
+ tag_date = 0

Property changes on: head/www/py-gandi.cli/files/patch-setup.cfg
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/py-gandi.cli/files/patch-setup.py
===================================================================
--- head/www/py-gandi.cli/files/patch-setup.py	(revision 501870)
+++ head/www/py-gandi.cli/files/patch-setup.py	(revision 501871)
@@ -1,35 +1,42 @@
---- setup.py.orig	2017-09-13 12:32:20 UTC
+--- setup.py.orig	2019-01-13 14:15:14 UTC
 +++ setup.py
-@@ -6,19 +6,19 @@ import os
+@@ -5,14 +5,15 @@ import re
+ import os
  import sys
  
- from setuptools import setup, find_packages
 +from io import open
++
+ from setuptools import setup, find_packages
+ from setuptools.command.test import test as TestCommand
  
  here = os.path.abspath(os.path.dirname(__file__))
 -README = open(os.path.join(here, 'README.md')).read()
 -CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 +README = open(os.path.join(here, 'README.md'), encoding='utf-8').read()
 +CHANGES = open(os.path.join(here, 'CHANGES.rst'), encoding='utf-8').read()
  
 -
- with open(os.path.join(here, 'gandi', 'cli', '__init__.py')) as v_file:
-     version = re.compile(r".*__version__ = '(.*?)'",
-                          re.S).match(v_file.read()).group(1)
+ class PyTest(TestCommand):
+     user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
  
- requires = ['setuptools', 'pyyaml', 'click>=3.1', 'requests', 'IPy']
+@@ -43,8 +44,10 @@ with open(os.path.join(here, 'gandi', 'cli', '__init__
  
--tests_require = ['nose', 'coverage', 'tox']
-+tests_require = []
- if sys.version_info < (2, 7):
-     tests_require += ['unittest2', 'importlib']
+ requires = ['setuptools', 'pyyaml', 'click>=7.0', 'requests', 'IPy']
  
-@@ -55,7 +55,7 @@ setup(name='gandi.cli',
-     zip_safe=False,
-     install_requires=requires,
-     tests_require=tests_require,
--    test_suite='nose.collector',
-+    test_suite='gandi.cli.tests',
-     extras_require=extras_require,
-     entry_points={
-         'console_scripts': [
+-tests_require = ['pytest', 'pytest-cov', 'tox']
++tests_require = ['pytest']
+ 
++dev_requires = ['pytest-cov', 'tox']
++
+ if sys.version_info < (3, 0):
+     tests_require += ['mock']
+ else:
+@@ -54,7 +57,7 @@ else:
+             " (sys.version: {})".format(sys.version))
+ 
+ extras_require = {
+-    'test': tests_require,
++    'dev': dev_requires,
+ }
+ 
+ setup(name='gandi.cli',