Index: head/www/py-grequests/Makefile =================================================================== --- head/www/py-grequests/Makefile (revision 410454) +++ head/www/py-grequests/Makefile (revision 410455) @@ -1,36 +1,31 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= grequests -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Requests with Gevent to make asyncronous HTTP requests LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:${PORTSDIR}/devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:${PORTSDIR}/www/py-requests -TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose + ${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose -OPTIONS_DEFINE= TESTS - -TESTS_DESC= Install test suite requirements -TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} - USE_GITHUB= yes GH_ACCOUNT= kennethreitz USES= python USE_PYTHON= autoplist distutils -regression-test: build +NO_ARCH= yes + +do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Index: head/www/py-grequests/distinfo =================================================================== --- head/www/py-grequests/distinfo (revision 410454) +++ head/www/py-grequests/distinfo (revision 410455) @@ -1,2 +1,2 @@ -SHA256 (kennethreitz-grequests-v0.2.0_GH0.tar.gz) = 7e8972ee76b8914dd4cab60df8f63d1b2b7970c390c8f43325491754d3292800 -SIZE (kennethreitz-grequests-v0.2.0_GH0.tar.gz) = 4107 +SHA256 (kennethreitz-grequests-v0.3.0_GH0.tar.gz) = 9c53602bb15d02881d1e0bfa12d58ba53fc9741e8c9e68ad1249b8e9097fa3be +SIZE (kennethreitz-grequests-v0.3.0_GH0.tar.gz) = 5449 Index: head/www/py-grequests/files/patch-setup.py =================================================================== --- head/www/py-grequests/files/patch-setup.py (revision 410454) +++ head/www/py-grequests/files/patch-setup.py (nonexistent) @@ -1,14 +0,0 @@ -# Support test command w/ tests_require & test_suite -# https://github.com/kennethreitz/grequests/pull/47 - ---- ./setup.py.orig 2014-02-16 17:35:13.772145487 +1100 -+++ ./setup.py 2014-02-16 17:36:15.191123632 +1100 -@@ -56,5 +56,7 @@ - 'Programming Language :: Python', - 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', - 'Topic :: Software Development :: Libraries :: Python Modules' -- ] -+ ], -+ tests_require = ['nose'], -+ test_suite = 'nose.collector', - ) Property changes on: head/www/py-grequests/files/patch-setup.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/py-grequests/files/patch-tests__test_grequests.py =================================================================== --- head/www/py-grequests/files/patch-tests__test_grequests.py (revision 410454) +++ head/www/py-grequests/files/patch-tests__test_grequests.py (nonexistent) @@ -1,23 +0,0 @@ -# Fix: request use **kwargs with its hooks. -# https://github.com/kennethreitz/grequests/commit/f50782ad63607b85e5e009f4a0a4ce0a8a6aef0d - ---- ./tests/test_grequests.py.orig 2014-02-16 17:23:40.926364751 +1100 -+++ ./tests/test_grequests.py 2014-02-16 17:24:14.491232949 +1100 -@@ -38,7 +38,7 @@ - def test_hooks(self): - result = {} - -- def hook(r): -+ def hook(r, **kwargs): - result[r.url] = True - return r - -@@ -49,7 +49,7 @@ - def test_callback_kwarg(self): - result = {'ok': False} - -- def callback(r): -+ def callback(r, **kwargs): - result['ok'] = True - return r - Property changes on: head/www/py-grequests/files/patch-tests__test_grequests.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/py-grequests/files/patch-2ffb8088 =================================================================== --- head/www/py-grequests/files/patch-2ffb8088 (nonexistent) +++ head/www/py-grequests/files/patch-2ffb8088 (revision 410455) @@ -0,0 +1,33 @@ +From 2ffb8088f24039aabef574b2680cb373fdb4604a Mon Sep 17 00:00:00 2001 +From: Yuri Prezument +Date: Tue, 23 Feb 2016 13:05:14 +0200 +Subject: [PATCH] Remove failing test + +Remove test_map_timeout_exception_handler_returns_false() test. +The functionality for this was removed in https://github.com/kennethreitz/grequests/commit/394cc +--- + tests.py | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/tests.py b/tests.py +index b3789e3..2b4ef0f 100644 +--- tests.py ++++ tests.py +@@ -130,17 +130,6 @@ def test_map_timeout_no_exception_handler(self): + self.assertTrue(responses[1].ok) + self.assertEqual(len(responses), 2) + +- def test_map_timeout_exception_handler_returns_false(self): +- """ +- if you don't want your exceptions to show up in the map result +- """ +- def exception_handler(request, exception): +- return False +- reqs = [grequests.get(httpbin('delay/1'), timeout=0.001), grequests.get(httpbin('/'))] +- responses = grequests.map(reqs, exception_handler=exception_handler) +- self.assertTrue(responses[0].ok) +- self.assertEqual(len(responses), 1) +- + def test_map_timeout_exception_handler_no_return(self): + """ + ensure default behaviour for a handler that returns None Property changes on: head/www/py-grequests/files/patch-2ffb8088 ___________________________________________________________________ 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