View | Details | Raw Unified | Return to bug 168569
Collapse All | Expand All

(-)./Makefile (-14 / +5 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	requests
8
PORTNAME=	requests
9
PORTVERSION=	0.12.1
9
PORTVERSION=	0.13.0
10
CATEGORIES=	www python
10
CATEGORIES=	www python
11
MASTER_SITES=	CHEESESHOP
11
MASTER_SITES=	CHEESESHOP
12
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
12
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 18-38 Link Here
18
LICENSE_FILE=	${WRKSRC}/LICENSE
18
LICENSE_FILE=	${WRKSRC}/LICENSE
19
19
20
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3
20
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3
21
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gevent/__init__.py:${PORTSDIR}/devel/py-gevent \
21
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/certifi/__init__.py:${PORTSDIR}/security/py-certify \
22
		${PYTHON_SITELIBDIR}/certifi/__init__.py:${PORTSDIR}/security/py-certify \
23
		${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3 \
22
		${PYTHON_PKGNAMEPREFIX}urllib3>=1.2:${PORTSDIR}/net/py-urllib3 \
24
		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.1:${PORTSDIR}/textproc/py-chardet
23
		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.1:${PORTSDIR}/textproc/py-chardet \
24
		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.1.0:${PORTSDIR}/net/py-oauthlib
25
25
26
USE_PYTHON=	2.6-3.1
26
USE_PYTHON=	2.6-3.1
27
USE_PYDISTUTILS=	easy_install
27
USE_PYDISTUTILS=	yes
28
29
REINPLACE_ARGS=	-i ""
30
31
PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
32
33
post-patch:
34
	@${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f \{\} \;
35
	@${FIND} ${WRKSRC} -type f -name '*.py' | \
36
		${XARGS} ${REINPLACE_CMD} 's|is_linux|is_freebsd|g'
37
28
38
.include <bsd.port.mk>
29
.include <bsd.port.mk>
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (requests-0.12.1.tar.gz) = 9ce56b87180c06728d96ca734055675abf8f5cc3136e0d7712a6260430685589
1
SHA256 (requests-0.13.0.tar.gz) = 03a2001843546147ddb6972d0661e2002b9be4ccbbbd2177ee10f05bd1910109
2
SIZE (requests-0.12.1.tar.gz) = 78245
2
SIZE (requests-0.13.0.tar.gz) = 68172
(-)./files/patch-requests.egg-info_SOURCES.txt (-20 lines)
Lines 1-20 Link Here
1
--- requests.egg-info/SOURCES.txt.orig	2012-03-31 05:47:55.000000000 +0200
2
+++ requests.egg-info/SOURCES.txt	2012-04-01 12:01:46.000000000 +0200
3
@@ -27,16 +27,3 @@
4
 requests/packages/oreos/core.py
5
 requests/packages/oreos/monkeys.py
6
 requests/packages/oreos/structures.py
7
-requests/packages/urllib3/__init__.py
8
-requests/packages/urllib3/_collections.py
9
-requests/packages/urllib3/connectionpool.py
10
-requests/packages/urllib3/exceptions.py
11
-requests/packages/urllib3/filepost.py
12
-requests/packages/urllib3/poolmanager.py
13
-requests/packages/urllib3/request.py
14
-requests/packages/urllib3/response.py
15
-requests/packages/urllib3/util.py
16
-requests/packages/urllib3/packages/__init__.py
17
-requests/packages/urllib3/packages/six.py
18
-requests/packages/urllib3/packages/mimetools_choose_boundary/__init__.py
19
-requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
20
\ No newline at end of file
(-)./files/patch-requests__models.py (+19 lines)
Line 0 Link Here
1
--- ./requests/models.py.orig	2012-06-02 00:23:03.000000000 +1000
2
+++ ./requests/models.py	2012-06-02 00:23:54.000000000 +1000
3
@@ -17,11 +17,11 @@
4
 
5
 from .auth import HTTPBasicAuth, HTTPProxyAuth
6
 from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
7
-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
8
-from .packages.urllib3.exceptions import SSLError as _SSLError
9
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
10
-from .packages.urllib3 import connectionpool, poolmanager
11
-from .packages.urllib3.filepost import encode_multipart_formdata
12
+from urllib3.exceptions import MaxRetryError, LocationParseError
13
+from urllib3.exceptions import SSLError as _SSLError
14
+from urllib3.exceptions import HTTPError as _HTTPError
15
+from urllib3 import connectionpool, poolmanager
16
+from urllib3.filepost import encode_multipart_formdata
17
 from .defaults import SCHEMAS
18
 from .exceptions import (
19
     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
(-)./files/patch-requests__safe_mode.py (+11 lines)
Line 0 Link Here
1
--- ./requests/safe_mode.py.orig	2012-06-02 00:24:10.000000000 +1000
2
+++ ./requests/safe_mode.py	2012-06-02 00:24:22.000000000 +1000
3
@@ -12,7 +12,7 @@
4
 """
5
 
6
 from .models import Response
7
-from .packages.urllib3.response import HTTPResponse
8
+from urllib3.response import HTTPResponse
9
 from .exceptions import RequestException, ConnectionError, HTTPError
10
 import socket
11
 
(-)./files/patch-requests__sessions.py (+11 lines)
Line 0 Link Here
1
--- ./requests/sessions.py.orig	2012-06-02 00:24:38.000000000 +1000
2
+++ ./requests/sessions.py	2012-06-02 00:24:51.000000000 +1000
3
@@ -16,7 +16,7 @@
4
 from .models import Request
5
 from .hooks import dispatch_hook
6
 from .utils import header_expand
7
-from .packages.urllib3.poolmanager import PoolManager
8
+from urllib3.poolmanager import PoolManager
9
 
10
 def merge_kwargs(local_kwarg, default_kwarg):
11
     """Merges kwarg dictionaries.
(-)./files/patch-requests_compat.py (-13 lines)
Lines 1-13 Link Here
1
--- requests/compat.py.orig	2012-02-15 09:48:23.000000000 +0100
2
+++ requests/compat.py	2012-03-19 17:40:30.000000000 +0100
3
@@ -66,8 +66,8 @@
4
 # Windows-based system.
5
 is_windows = 'win32' in str(sys.platform).lower()
6
 
7
-# Standard Linux 2+ system.
8
-is_linux = ('linux' in str(sys.platform).lower())
9
+# Standard system.
10
+is_linux = ('freebsd' in str(sys.platform).lower())
11
 is_osx = ('darwin' in str(sys.platform).lower())
12
 is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
13
 is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
(-)./files/patch-requests_models.py (-15 lines)
Lines 1-15 Link Here
1
--- requests/models.py.orig	2012-05-08 07:13:56.000000000 +0200
2
+++ requests/models.py	2012-05-19 13:33:03.000000000 +0200
3
@@ -17,12 +17,6 @@
4
 
5
 from .auth import HTTPBasicAuth, HTTPProxyAuth
6
 from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
7
-from .packages.urllib3.response import HTTPResponse
8
-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
9
-from .packages.urllib3.exceptions import SSLError as _SSLError
10
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
11
-from .packages.urllib3 import connectionpool, poolmanager
12
-from .packages.urllib3.filepost import encode_multipart_formdata
13
 from .defaults import SCHEMAS
14
 from .exceptions import (
15
     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
(-)./files/patch-requests_packages___init__.py (-7 lines)
Lines 1-7 Link Here
1
--- requests/packages/__init__.py.orig	2011-12-06 23:55:15.000000000 +0100
2
+++ requests/packages/__init__.py	2012-01-12 18:46:03.000000000 +0100
3
@@ -1,3 +1,3 @@
4
 from __future__ import absolute_import
5
 
6
-from . import urllib3
7
+#from . import urllib3
(-)./files/patch-requests_sessions.py (-11 lines)
Lines 1-11 Link Here
1
--- requests/sessions.py.orig	2011-12-28 10:51:45.000000000 +0100
2
+++ requests/sessions.py	2012-01-12 23:30:39.000000000 +0100
3
@@ -13,7 +13,7 @@
4
 from .models import Request
5
 from .hooks import dispatch_hook
6
 from .utils import header_expand
7
-from .packages.urllib3.poolmanager import PoolManager
8
+from urllib3.poolmanager import PoolManager
9
 
10
 
11
 def merge_kwargs(local_kwarg, default_kwarg):
(-)./files/patch-setup.py (-41 / +24 lines)
Lines 1-54 Link Here
1
--- setup.py.orig	2012-05-08 06:56:28.000000000 +0200
1
--- ./setup.py.orig	2012-05-11 08:09:45.000000000 +1000
2
+++ setup.py	2012-05-19 13:42:13.000000000 +0200
2
+++ ./setup.py	2012-06-02 00:17:21.000000000 +1000
3
@@ -11,7 +11,7 @@
3
@@ -10,12 +10,7 @@
4
 import requests
4
 from requests.compat import is_py3
5
 from requests.compat import is_py3
5
 
6
 
6
 try:
7
-try:
7
-    from setuptools import setup
8
-    from setuptools import setup
8
+    from setuptools import setup, find_packages
9
-    # hush pyflakes
9
     # hush pyflakes
10
-    setup
10
     setup
11
-except ImportError:
11
 except ImportError:
12
-    from distutils.core import setup
12
@@ -21,31 +21,8 @@
13
+from distutils.core import setup
14
 
15
 if sys.argv[-1] == 'publish':
13
     os.system('python setup.py sdist upload')
16
     os.system('python setup.py sdist upload')
14
     sys.exit()
17
@@ -23,11 +18,6 @@
15
 
18
 
16
-packages = [
19
 packages = [
17
-    'requests',
20
     'requests',
18
-    'requests.packages',
21
-    'requests.packages',
19
-    'requests.packages.urllib3',
22
-    'requests.packages.urllib3',
20
-    'requests.packages.urllib3.packages',
23
-    'requests.packages.urllib3.packages',
21
-    'requests.packages.urllib3.packages.ssl_match_hostname',
24
-    'requests.packages.urllib3.packages.ssl_match_hostname',
22
-    'requests.packages.urllib3.packages.mimetools_choose_boundary',
25
-    'requests.packages.urllib3.packages.mimetools_choose_boundary',
23
-]
26
 ]
24
-
25
-# certifi is a Python package containing a CA certificate bundle for SSL verification.
26
-# On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can
27
-# use the system CA bundle instead; see `requests.utils` for details.
28
-# If your platform is supported, set `requires` to [] instead:
29
-requires = ['certifi>=0.0.7']
30
-
31
-# chardet is used to optimally guess the encodings of pages that don't declare one.
32
-# At this time, chardet is not a required dependency. However, it's sufficiently
33
-# important that pip/setuptools should install it when it's unavailable.
34
-if is_py3:
35
-    chardet_package = 'chardet2'
36
-else:
37
-    chardet_package = 'chardet>=1.0.0'
38
-    requires.append('oauthlib>=0.1.0,<0.2.0')
39
-
40
-requires.append(chardet_package)
41
+# FreeBSD ports tree, provides only chardet2
42
+requires = ['certifi>=0.0.7', 'chardet>=2.0.0']
43
 
27
 
44
 # The async API in requests.async requires the gevent package.
28
 # certifi is a Python package containing a CA certificate bundle for SSL verification.
45
 # This is also not a required dependency.
29
@@ -58,8 +48,6 @@
46
@@ -62,7 +39,7 @@
47
     author='Kenneth Reitz',
48
     author_email='me@kennethreitz.com',
49
     url='http://python-requests.org',
30
     url='http://python-requests.org',
50
-    packages=packages,
31
     packages=packages,
51
+    packages=find_packages(exclude=['requests.packages.url*']),
52
     package_data={'': ['LICENSE', 'NOTICE']},
32
     package_data={'': ['LICENSE', 'NOTICE']},
53
     include_package_data=True,
33
-    include_package_data=True,
54
     install_requires=requires,
34
-    install_requires=requires,
35
     license=open("LICENSE").read(),
36
     classifiers=(
37
         'Development Status :: 5 - Production/Stable',
(-)./pkg-plist (+46 lines)
Line 0 Link Here
1
%%PYTHON_SITELIBDIR%%/requests/__init__.py
2
%%PYTHON_SITELIBDIR%%/requests/__init__.pyc
3
%%PYTHON_SITELIBDIR%%/requests/__init__.pyo
4
%%PYTHON_SITELIBDIR%%/requests/api.py
5
%%PYTHON_SITELIBDIR%%/requests/api.pyc
6
%%PYTHON_SITELIBDIR%%/requests/api.pyo
7
%%PYTHON_SITELIBDIR%%/requests/async.py
8
%%PYTHON_SITELIBDIR%%/requests/async.pyc
9
%%PYTHON_SITELIBDIR%%/requests/async.pyo
10
%%PYTHON_SITELIBDIR%%/requests/auth.py
11
%%PYTHON_SITELIBDIR%%/requests/auth.pyc
12
%%PYTHON_SITELIBDIR%%/requests/auth.pyo
13
%%PYTHON_SITELIBDIR%%/requests/compat.py
14
%%PYTHON_SITELIBDIR%%/requests/compat.pyc
15
%%PYTHON_SITELIBDIR%%/requests/compat.pyo
16
%%PYTHON_SITELIBDIR%%/requests/cookies.py
17
%%PYTHON_SITELIBDIR%%/requests/cookies.pyc
18
%%PYTHON_SITELIBDIR%%/requests/cookies.pyo
19
%%PYTHON_SITELIBDIR%%/requests/defaults.py
20
%%PYTHON_SITELIBDIR%%/requests/defaults.pyc
21
%%PYTHON_SITELIBDIR%%/requests/defaults.pyo
22
%%PYTHON_SITELIBDIR%%/requests/exceptions.py
23
%%PYTHON_SITELIBDIR%%/requests/exceptions.pyc
24
%%PYTHON_SITELIBDIR%%/requests/exceptions.pyo
25
%%PYTHON_SITELIBDIR%%/requests/hooks.py
26
%%PYTHON_SITELIBDIR%%/requests/hooks.pyc
27
%%PYTHON_SITELIBDIR%%/requests/hooks.pyo
28
%%PYTHON_SITELIBDIR%%/requests/models.py
29
%%PYTHON_SITELIBDIR%%/requests/models.pyc
30
%%PYTHON_SITELIBDIR%%/requests/models.pyo
31
%%PYTHON_SITELIBDIR%%/requests/safe_mode.py
32
%%PYTHON_SITELIBDIR%%/requests/safe_mode.pyc
33
%%PYTHON_SITELIBDIR%%/requests/safe_mode.pyo
34
%%PYTHON_SITELIBDIR%%/requests/sessions.py
35
%%PYTHON_SITELIBDIR%%/requests/sessions.pyc
36
%%PYTHON_SITELIBDIR%%/requests/sessions.pyo
37
%%PYTHON_SITELIBDIR%%/requests/status_codes.py
38
%%PYTHON_SITELIBDIR%%/requests/status_codes.pyc
39
%%PYTHON_SITELIBDIR%%/requests/status_codes.pyo
40
%%PYTHON_SITELIBDIR%%/requests/structures.py
41
%%PYTHON_SITELIBDIR%%/requests/structures.pyc
42
%%PYTHON_SITELIBDIR%%/requests/structures.pyo
43
%%PYTHON_SITELIBDIR%%/requests/utils.py
44
%%PYTHON_SITELIBDIR%%/requests/utils.pyc
45
%%PYTHON_SITELIBDIR%%/requests/utils.pyo
46
@dirrm %%PYTHON_SITELIBDIR%%/requests

Return to bug 168569