From owner-svn-ports-all@freebsd.org Sat Jul 15 09:15:47 2017 Return-Path: Delivered-To: svn-ports-all@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 E834ADBE29B; Sat, 15 Jul 2017 09:15:47 +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 B981E6A2C2; Sat, 15 Jul 2017 09:15:47 +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 v6F9FkZw062862; Sat, 15 Jul 2017 09:15:46 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6F9Fk1A062859; Sat, 15 Jul 2017 09:15:46 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201707150915.v6F9Fk1A062859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 15 Jul 2017 09:15:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445859 - in head/net/turses: . files X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in head/net/turses: . files X-SVN-Commit-Revision: 445859 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jul 2017 09:15:48 -0000 Author: koobs Date: Sat Jul 15 09:15:46 2017 New Revision: 445859 URL: https://svnweb.freebsd.org/changeset/ports/445859 Log: net/turses: Update to 0.3.1 * Add future, add explicit versions to RUN_DEPENDS * Add configparser to a conditional RUN_DEPENDS ( < 3.x) * Remove TESTS option (test framework takes care of installing dependencies) * No longer restrict to 2.7 (Supports 3.x), add PKGNAMEPREFIX accordingly * Enable multiple concurrent Python installation (create unique file names) * Remove bits adding test command to setup.py patch * Switch to nose instead of pytest for tests * Update test target (to invoke nose directly) accordingly * Add NO_ARCH Modified: head/net/turses/Makefile head/net/turses/distinfo head/net/turses/files/patch-setup.py Modified: head/net/turses/Makefile ============================================================================== --- head/net/turses/Makefile Sat Jul 15 09:00:25 2017 (r445858) +++ head/net/turses/Makefile Sat Jul 15 09:15:46 2017 (r445859) @@ -2,32 +2,34 @@ # $FreeBSD$ PORTNAME= turses -PORTVERSION= 0.3.0 +PORTVERSION= 0.3.1 CATEGORIES= net python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Python Twitter client for the console LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}tweepy>=2.2:net/py-tweepy -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid \ + ${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy \ + ${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose -OPTIONS_DEFINE= TESTS +USES= python +USE_PYTHON= autoplist concurrent distutils -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${TEST_DEPENDS} +NO_ARCH= yes -USES= python:2.7 -USE_PYTHON= autoplist distutils +.include -NO_ARCH= yes +.if ${PYTHON_REL} < 3000 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser +.endif -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v -.include +.include Modified: head/net/turses/distinfo ============================================================================== --- head/net/turses/distinfo Sat Jul 15 09:00:25 2017 (r445858) +++ head/net/turses/distinfo Sat Jul 15 09:15:46 2017 (r445859) @@ -1,2 +1,3 @@ -SHA256 (turses-0.3.0.tar.gz) = 9b6737655b006a1b03123ea294335170ffa576d3696abcfe6dd2853723d5dcca -SIZE (turses-0.3.0.tar.gz) = 50395 +TIMESTAMP = 1500110128 +SHA256 (turses-0.3.1.tar.gz) = 46a61541d1acd1338561a198b3011081b91f118415c08b111444cdb24685b396 +SIZE (turses-0.3.1.tar.gz) = 50617 Modified: head/net/turses/files/patch-setup.py ============================================================================== --- head/net/turses/files/patch-setup.py Sat Jul 15 09:00:25 2017 (r445858) +++ head/net/turses/files/patch-setup.py Sat Jul 15 09:15:46 2017 (r445859) @@ -1,53 +1,25 @@ ---- setup.py.orig 2015-07-07 10:35:56 UTC +--- setup.py.orig 2015-08-06 17:43:56 UTC +++ setup.py -@@ -32,6 +32,8 @@ See ``AUTHORS`` for a full list of contr - """ +@@ -39,15 +39,17 @@ import turses + NAME = "turses" - from setuptools import setup, find_packages -+from setuptools.command.test import test as TestCommand -+import sys - from sys import version_info - - import turses -@@ -40,13 +42,31 @@ NAME = "turses" - REQUIREMENTS = [ - "urwid", -- "tweepy==3.1.0", -+ "tweepy>=3.1.0", +- "urwid==1.3.0", +- "tweepy==3.3.0", +- "future==0.14.3", ++ "urwid>=1.3.0", ++ "tweepy>=3.3.0", ++ "future>=0.14.3", ] if version_info[:2] == (2, 6): REQUIREMENTS.append("argparse") - TEST_REQUIREMENTS = list(REQUIREMENTS) +-TEST_REQUIREMENTS = list(REQUIREMENTS) -TEST_REQUIREMENTS.extend(["mock", "pytest", "coverage", "tox"]) -+TEST_REQUIREMENTS.extend(["mock", "pytest"]) -+ -+class PyTest(TestCommand): -+ user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] -+ -+ def initialize_options(self): -+ TestCommand.initialize_options(self) -+ self.pytest_args = [] -+ -+ def finalize_options(self): -+ TestCommand.finalize_options(self) -+ self.test_args = [] -+ self.test_suite = True -+ -+ def run_tests(self): -+ #import here, cause outside the eggs aren't loaded -+ import pytest -+ errno = pytest.main(self.pytest_args) -+ sys.exit(errno) ++TEST_REQUIREMENTS = [ ++ "mock", ++ "nose" ++] try: long_description = open("README.rst").read() + "\n\n" + open( -@@ -80,4 +100,6 @@ setup(name=NAME, - "Topic :: Communications", - ], - install_requires=REQUIREMENTS, -- tests_require=TEST_REQUIREMENTS) -+ tests_require=TEST_REQUIREMENTS, -+ cmdclass = {'test': PyTest}, -+)