From owner-svn-ports-head@freebsd.org Thu Jul 28 14:51:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46B6ABA7C84; Thu, 28 Jul 2016 14:51:49 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0DD011C3; Thu, 28 Jul 2016 14:51:48 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6SEpmRT097171; Thu, 28 Jul 2016 14:51:48 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6SEpmpM097170; Thu, 28 Jul 2016 14:51:48 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201607281451.u6SEpmpM097170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Thu, 28 Jul 2016 14:51:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419223 - head/www/py-gandi.cli/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jul 2016 14:51:49 -0000 Author: koobs Date: Thu Jul 28 14:51:47 2016 New Revision: 419223 URL: https://svnweb.freebsd.org/changeset/ports/419223 Log: www/py-gandi.cli: Restore patches to setup.py Restore the patches to the setup.py file removed in r419220 [1], as these changes have not been upstreamed and removing them breaks the test target, which attempts to install dependencies such as tox & nose via setuptools, and which aren't required to run tests. [1] https://svnweb.freebsd.org/changeset/ports/419220 pointyhat: bapt Added: head/www/py-gandi.cli/files/ head/www/py-gandi.cli/files/patch-setup.py (contents, props changed) Added: head/www/py-gandi.cli/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-gandi.cli/files/patch-setup.py Thu Jul 28 14:51:47 2016 (r419223) @@ -0,0 +1,35 @@ +--- setup.py.orig 2016-02-08 14:17:09 UTC ++++ setup.py +@@ -6,11 +6,11 @@ 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 + + requires = ['setuptools', 'pyyaml', 'click>=3.1', 'requests', 'IPy'] + +-tests_require = ['nose', 'coverage', 'tox', 'httpretty==0.8.6'] ++tests_require = ['httpretty>=0.8.6'] + if sys.version_info < (2, 7): + tests_require += ['unittest2', 'importlib'] + +@@ -54,7 +54,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': [