Date: Mon, 19 Mar 2012 17:42:00 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/166252: [UPDATE] www/py-requests to 0.10.8 Message-ID: <201203191742.q2JHg0C9042635@red.freebsd.org> Resent-Message-ID: <201203191750.q2JHoEkh009483@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166252 >Category: ports >Synopsis: [UPDATE] www/py-requests to 0.10.8 >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: Mon Mar 19 17:50:13 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE-p3 i386 >Organization: >Environment: >Description: Based on Jimmy Olgeni's work [1]. There's an issue with py-chardet (I used this PR [2]), URL in MASTER_SITES macro isn't any more valid. Archive can be found on Python Package Index (pypi), and version is equivalent to "chardet2" [3]. [1] http://www.freebsd.org/cgi/query-pr.cgi?pr=166142 [2] http://www.freebsd.org/cgi/query-pr.cgi?pr=164855 [3] http://pypi.python.org/pypi/chardet2 >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-03-19 18:13:07.000000000 +0100 @@ -6,7 +6,7 @@ # PORTNAME= requests -PORTVERSION= 0.10.1 +PORTVERSION= 0.10.8 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,9 +21,9 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gevent/__init__.py:${PORTSDIR}/devel/py-gevent \ ${PYTHON_SITELIBDIR}/certifi/__init__.py:${PORTSDIR}/security/py-certify \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}chardet>=2.0.1:${PORTSDIR}/textproc/py-chardet + ${PYTHON_PKGNAMEPREFIX}chardet2>=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-03-19 18:13:07.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (requests-0.10.1.tar.gz) = da6031575a30c7b65ea99465183468349b3645e6bf5322e49d53f565b27ed2b5 -SIZE (requests-0.10.1.tar.gz) = 63234 +SHA256 (requests-0.10.8.tar.gz) = bec280d924a8be87b3377ee78a976334a6e7c944a8fe09bbd9447e669b984dae +SIZE (requests-0.10.8.tar.gz) = 62201 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-03-19 18:13:07.000000000 +0100 @@ -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-09 17:59:53.000000000 +0100 ++++ requests.egg-info/SOURCES.txt 2012-03-19 17:58:26.000000000 +0100 +@@ -27,15 +27,3 @@ requests/packages/oreos/core.py requests/packages/oreos/monkeys.py requests/packages/oreos/structures.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-03-19 18:13:07.000000000 +0100 @@ -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-03-19 18:13:07.000000000 +0100 @@ -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-03-19 18:13:07.000000000 +0100 @@ -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-03-19 17:45:06.000000000 +0100 @@ -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'] 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203191742.q2JHg0C9042635>