From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 1 10:30:13 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E7F53106566B for ; Sun, 1 Apr 2012 10:30:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BF1AA8FC14 for ; Sun, 1 Apr 2012 10:30:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q31AUD9G037715 for ; Sun, 1 Apr 2012 10:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q31AUDou037711; Sun, 1 Apr 2012 10:30:13 GMT (envelope-from gnats) Resent-Date: Sun, 1 Apr 2012 10:30:13 GMT Resent-Message-Id: <201204011030.q31AUDou037711@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olivier Duchateau Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38898106566B for ; Sun, 1 Apr 2012 10:29:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 229038FC0A for ; Sun, 1 Apr 2012 10:29:08 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q31AT7ct050424 for ; Sun, 1 Apr 2012 10:29:07 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q31AT7bR050423; Sun, 1 Apr 2012 10:29:07 GMT (envelope-from nobody) Message-Id: <201204011029.q31AT7bR050423@red.freebsd.org> Date: Sun, 1 Apr 2012 10:29:07 GMT From: Olivier Duchateau To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/166558: [UPDATE] www/py-requests to 0.11.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Apr 2012 10:30:14 -0000 >Number: 166558 >Category: ports >Synopsis: [UPDATE] www/py-requests to 0.11.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 01 10:30:13 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE-p3 i386 >Organization: >Environment: >Description: - Fix chardet module in setup.py file - clean obsolete patches >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/www/py-requests/Makefile py-requests/Makefile --- /usr/ports/www/py-requests/Makefile 2012-03-04 13:56:24.000000000 +0100 +++ py-requests/Makefile 2012-04-01 12:06:02.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= requests -PORTVERSION= 0.10.1 +PORTVERSION= 0.11.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,7 +23,7 @@ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3 \ ${PYTHON_PKGNAMEPREFIX}chardet>=2.0.1:${PORTSDIR}/textproc/py-chardet -USE_PYTHON= 2.6+ +USE_PYTHON= 2.6-3.1 USE_PYDISTUTILS= easy_install REINPLACE_ARGS= -i "" diff -urN /usr/ports/www/py-requests/distinfo py-requests/distinfo --- /usr/ports/www/py-requests/distinfo 2012-03-04 13:56:24.000000000 +0100 +++ py-requests/distinfo 2012-04-01 12:06:02.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (requests-0.10.1.tar.gz) = da6031575a30c7b65ea99465183468349b3645e6bf5322e49d53f565b27ed2b5 -SIZE (requests-0.10.1.tar.gz) = 63234 +SHA256 (requests-0.11.1.tar.gz) = fd4260541d0e559c78e2b3072bd79f36e0f8ef935bcbbadaa8c98cd8b5a62897 +SIZE (requests-0.11.1.tar.gz) = 63100 diff -urN /usr/ports/www/py-requests/files/patch-MANIFEST.in py-requests/files/patch-MANIFEST.in --- /usr/ports/www/py-requests/files/patch-MANIFEST.in 2012-03-04 13:56:25.000000000 +0100 +++ py-requests/files/patch-MANIFEST.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ ---- MANIFEST.in.orig 2012-01-22 09:30:39.000000000 +0000 -+++ MANIFEST.in 2012-02-07 15:15:00.000000000 +0000 -@@ -1 +1 @@ --include README.rst LICENSE NOTICE HISTORY.rst test_requests.py -+include README.rst LICENSE NOTICE HISTORY.rst diff -urN /usr/ports/www/py-requests/files/patch-requests.egg-info_SOURCES.txt py-requests/files/patch-requests.egg-info_SOURCES.txt --- /usr/ports/www/py-requests/files/patch-requests.egg-info_SOURCES.txt 2012-03-04 13:56:25.000000000 +0100 +++ py-requests/files/patch-requests.egg-info_SOURCES.txt 2012-04-01 12:06:02.000000000 +0200 @@ -1,14 +1,6 @@ ---- requests.egg-info/SOURCES.txt.orig 2012-01-23 07:22:50.000000000 +0000 -+++ requests.egg-info/SOURCES.txt 2012-02-07 15:14:04.000000000 +0000 -@@ -4,7 +4,6 @@ - NOTICE - README.rst - setup.py --test_requests.py - requests/__init__.py - requests/api.py - requests/async.py -@@ -28,15 +27,3 @@ +--- requests.egg-info/SOURCES.txt.orig 2012-03-31 05:47:55.000000000 +0200 ++++ requests.egg-info/SOURCES.txt 2012-04-01 12:01:46.000000000 +0200 +@@ -27,16 +27,3 @@ requests/packages/oreos/core.py requests/packages/oreos/monkeys.py requests/packages/oreos/structures.py @@ -20,6 +12,7 @@ -requests/packages/urllib3/poolmanager.py -requests/packages/urllib3/request.py -requests/packages/urllib3/response.py +-requests/packages/urllib3/util.py -requests/packages/urllib3/packages/__init__.py -requests/packages/urllib3/packages/six.py -requests/packages/urllib3/packages/mimetools_choose_boundary/__init__.py diff -urN /usr/ports/www/py-requests/files/patch-requests_compat.py py-requests/files/patch-requests_compat.py --- /usr/ports/www/py-requests/files/patch-requests_compat.py 2012-03-04 13:56:25.000000000 +0100 +++ py-requests/files/patch-requests_compat.py 2012-04-01 12:06:02.000000000 +0200 @@ -1,14 +1,6 @@ ---- requests/compat.py.orig 2012-01-23 06:35:35.000000000 +0000 -+++ requests/compat.py 2012-02-07 15:46:29.000000000 +0000 -@@ -4,7 +4,6 @@ - pythoncompat - """ - -- - import sys - - # ------- -@@ -66,8 +65,8 @@ +--- requests/compat.py.orig 2012-02-15 09:48:23.000000000 +0100 ++++ requests/compat.py 2012-03-19 17:40:30.000000000 +0100 +@@ -66,8 +66,8 @@ # Windows-based system. is_windows = 'win32' in str(sys.platform).lower() diff -urN /usr/ports/www/py-requests/files/patch-requests_models.py py-requests/files/patch-requests_models.py --- /usr/ports/www/py-requests/files/patch-requests_models.py 2012-03-04 13:56:25.000000000 +0100 +++ py-requests/files/patch-requests_models.py 2012-04-01 12:06:02.000000000 +0200 @@ -1,8 +1,8 @@ ---- requests/models.py.orig 2011-12-28 09:56:17.000000000 +0100 -+++ requests/models.py 2012-01-12 17:54:01.000000000 +0100 -@@ -19,12 +19,12 @@ +--- requests/models.py.orig 2012-03-09 17:51:20.000000000 +0100 ++++ requests/models.py 2012-03-19 17:49:25.000000000 +0100 +@@ -15,12 +15,12 @@ from .status_codes import codes - from .packages import oreos + from .auth import HTTPBasicAuth, HTTPProxyAuth -from .packages.urllib3.response import HTTPResponse -from .packages.urllib3.exceptions import MaxRetryError @@ -16,6 +16,6 @@ +from urllib3.exceptions import HTTPError as _HTTPError +from urllib3 import connectionpool, poolmanager +from urllib3.filepost import encode_multipart_formdata + from .defaults import SCHEMAS from .exceptions import ( ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects, - URLRequired, SSLError) diff -urN /usr/ports/www/py-requests/files/patch-setup.py py-requests/files/patch-setup.py --- /usr/ports/www/py-requests/files/patch-setup.py 2012-03-04 13:56:25.000000000 +0100 +++ py-requests/files/patch-setup.py 2012-04-01 12:06:02.000000000 +0200 @@ -1,10 +1,10 @@ ---- setup.py.orig 2012-01-23 06:48:28.000000000 +0000 -+++ setup.py 2012-02-07 16:11:32.000000000 +0000 +--- setup.py.orig 2012-02-15 09:48:23.000000000 +0100 ++++ setup.py 2012-04-01 12:00:30.000000000 +0200 @@ -4,10 +4,9 @@ import os import sys import requests --from requests.compat import is_py3 +-from requests.compat import is_py3, is_py2 try: - from setuptools import setup @@ -12,35 +12,36 @@ except ImportError: from distutils.core import setup -@@ -21,12 +20,8 @@ +@@ -21,21 +20,8 @@ os.system('python test_requests.py') sys.exit() -required = ['certifi>=0.0.7',] +-packages = [ +- 'requests', +- 'requests.packages', +- 'requests.packages.urllib3', +- 'requests.packages.urllib3.packages', +- 'requests.packages.urllib3.packages.ssl_match_hostname', +- 'requests.packages.urllib3.packages.mimetools_choose_boundary', +-] - -if is_py3: - required.append('chardet2') -else: - required.append('chardet>=1.0.0') +- packages.append('requests.packages.oreos') +# FreeBSD ports tree, provides only chardet2 -+required = ['certifi>=0.0.7', 'chardet2>=1.0.0'] ++required = ['certifi>=0.0.7', 'chardet>=2.0.0'] setup( -@@ -38,15 +33,7 @@ +@@ -47,7 +33,7 @@ author='Kenneth Reitz', author_email='me@kennethreitz.com', url='http://python-requests.org', -- packages=[ -- 'requests', -- 'requests.packages', -- 'requests.packages.urllib3', -- 'requests.packages.urllib3.packages', -- 'requests.packages.urllib3.packages.ssl_match_hostname', -- 'requests.packages.urllib3.packages.mimetools_choose_boundary', -- 'requests.packages.oreos' -- ], -+ packages=find_packages(where='.', exclude=['requests.packages.url*']), +- packages=packages, ++ packages=find_packages(exclude=['requests.packages.url*']), package_data={'': ['LICENSE', 'NOTICE']}, include_package_data=True, install_requires=required, >Release-Note: >Audit-Trail: >Unformatted: