Index: head/www/py-gandi.cli/Makefile
===================================================================
--- head/www/py-gandi.cli/Makefile	(revision 449905)
+++ head/www/py-gandi.cli/Makefile	(revision 449906)
@@ -1,36 +1,36 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gandi.cli
-PORTVERSION=	0.21
+PORTVERSION=	0.22
 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 \
 		${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy
 
 # 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
 .endif
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
Index: head/www/py-gandi.cli/distinfo
===================================================================
--- head/www/py-gandi.cli/distinfo	(revision 449905)
+++ head/www/py-gandi.cli/distinfo	(revision 449906)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505202146
-SHA256 (gandi.cli-0.21.tar.gz) = 931da484b50a3cb99f58013588b749be01663488689c5057035434a37befd8c5
-SIZE (gandi.cli-0.21.tar.gz) = 149213
+TIMESTAMP = 1505488175
+SHA256 (gandi.cli-0.22.tar.gz) = 5666b544e313132cf9cfe82fb3a163ce140df0e1b91d5452d54dd50a49b0b8e6
+SIZE (gandi.cli-0.22.tar.gz) = 149823
Index: head/www/py-gandi.cli/files/patch-setup.py
===================================================================
--- head/www/py-gandi.cli/files/patch-setup.py	(revision 449905)
+++ head/www/py-gandi.cli/files/patch-setup.py	(revision 449906)
@@ -1,35 +1,35 @@
---- setup.py.orig	2016-02-08 14:17:09 UTC
+--- setup.py.orig	2017-09-13 12:32:20 UTC
 +++ setup.py
-@@ -6,11 +6,11 @@ import os
+@@ -6,19 +6,19 @@ import os
  import sys
  
  from setuptools import setup, find_packages
 +from io import open
  
  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__ = '(.*?)'",
-@@ -18,7 +18,7 @@ with open(os.path.join(here, 'gandi', 'c
+                          re.S).match(v_file.read()).group(1)
  
  requires = ['setuptools', 'pyyaml', 'click>=3.1', 'requests', 'IPy']
  
--tests_require = ['nose', 'coverage', 'tox', 'httpretty==0.8.6']
-+tests_require = ['httpretty>=0.8.6']
+-tests_require = ['nose', 'coverage', 'tox']
++tests_require = []
  if sys.version_info < (2, 7):
      tests_require += ['unittest2', 'importlib']
  
-@@ -54,7 +54,7 @@ setup(name='gandi.cli',
+@@ -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': [