Index: head/www/py-gandi.cli/Makefile =================================================================== --- head/www/py-gandi.cli/Makefile (revision 393875) +++ head/www/py-gandi.cli/Makefile (revision 393876) @@ -1,42 +1,41 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= gandi.cli -PORTVERSION= 0.14 +PORTVERSION= 0.15 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:${PORTSDIR}/devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}click<=4.0:${PORTSDIR}/devel/py-click \ + ${PYTHON_PKGNAMEPREFIX}click>=3.0:${PORTSDIR}/devel/py-click \ ${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \ ${PYTHON_PKGNAMEPREFIX}ipy>0:${PORTSDIR}/net-mgmt/py-ipy - -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \ ${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage OPTIONS_DEFINE= TESTS TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} +TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ + ${TEST_DEPENDS} USES= python USE_PYTHON= autoplist concurrent distutils .include .if ${PYTHON_REL} < 3300 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock .endif regression-test: build @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Index: head/www/py-gandi.cli/distinfo =================================================================== --- head/www/py-gandi.cli/distinfo (revision 393875) +++ head/www/py-gandi.cli/distinfo (revision 393876) @@ -1,2 +1,2 @@ -SHA256 (gandi.cli-0.14.tar.gz) = 80f0a499d871b363ad0e0687d06da5e6935b586b7fe7bc0b92ef4cc43c08bb05 -SIZE (gandi.cli-0.14.tar.gz) = 342573 +SHA256 (gandi.cli-0.15.tar.gz) = 84c6e0aaa5fd509ab6b2e912a683f9090dc68ef122ae1a9df32ed0393df1ab7b +SIZE (gandi.cli-0.15.tar.gz) = 359801 Index: head/www/py-gandi.cli/files/patch-setup.py =================================================================== --- head/www/py-gandi.cli/files/patch-setup.py (revision 393875) +++ head/www/py-gandi.cli/files/patch-setup.py (revision 393876) @@ -1,33 +1,35 @@ --- setup.py.orig 2015-04-01 08:43:36 UTC +++ setup.py -@@ -6,10 +6,11 @@ import os +@@ -6,19 +6,20 @@ 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: -@@ -18,7 +19,7 @@ with open(os.path.join(here, 'gandi', 'c + version = re.compile(r".*__version__ = '(.*?)'", + re.S).match(v_file.read()).group(1) - requires = ['setuptools', 'pyyaml', 'click<=4.0', 'requests', 'IPy'] +-requires = ['setuptools', 'pyyaml', 'click<=4.0', 'requests', 'IPy'] ++requires = ['setuptools', 'pyyaml', 'click>=3.0', 'requests', 'IPy'] -tests_require = ['nose', 'coverage', 'tox', 'httpretty==0.8.6'] +tests_require = ['nose', 'httpretty==0.8.6' ] if sys.version_info < (2, 7): tests_require += ['unittest2', 'importlib'] @@ -52,6 +53,7 @@ setup(name='gandi.cli', zip_safe=False, install_requires=requires, tests_require=tests_require, + test_suite='gandi.cli.tests', extras_require=extras_require, entry_points="""\ [console_scripts]