Lines 1-22
Link Here
|
1 |
--- setup.py.orig 2012-02-15 09:48:23.000000000 +0100 |
1 |
--- setup.py.orig 2012-05-08 06:56:28.000000000 +0200 |
2 |
+++ setup.py 2012-04-01 12:00:30.000000000 +0200 |
2 |
+++ setup.py 2012-05-19 13:42:13.000000000 +0200 |
3 |
@@ -4,10 +4,9 @@ |
3 |
@@ -11,7 +11,7 @@ |
4 |
import os |
4 |
from requests.compat import is_py3 |
5 |
import sys |
|
|
6 |
import requests |
7 |
-from requests.compat import is_py3, is_py2 |
8 |
|
5 |
|
9 |
try: |
6 |
try: |
10 |
- from setuptools import setup |
7 |
- from setuptools import setup |
11 |
+ from setuptools import setup, find_packages |
8 |
+ from setuptools import setup, find_packages |
|
|
9 |
# hush pyflakes |
10 |
setup |
12 |
except ImportError: |
11 |
except ImportError: |
13 |
from distutils.core import setup |
12 |
@@ -21,31 +21,8 @@ |
14 |
|
13 |
os.system('python setup.py sdist upload') |
15 |
@@ -21,21 +20,8 @@ |
|
|
16 |
os.system('python test_requests.py') |
17 |
sys.exit() |
14 |
sys.exit() |
18 |
|
15 |
|
19 |
-required = ['certifi>=0.0.7',] |
|
|
20 |
-packages = [ |
16 |
-packages = [ |
21 |
- 'requests', |
17 |
- 'requests', |
22 |
- 'requests.packages', |
18 |
- 'requests.packages', |
Lines 26-42
Link Here
|
26 |
- 'requests.packages.urllib3.packages.mimetools_choose_boundary', |
22 |
- 'requests.packages.urllib3.packages.mimetools_choose_boundary', |
27 |
-] |
23 |
-] |
28 |
- |
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. |
29 |
-if is_py3: |
34 |
-if is_py3: |
30 |
- required.append('chardet2') |
35 |
- chardet_package = 'chardet2' |
31 |
-else: |
36 |
-else: |
32 |
- required.append('chardet>=1.0.0') |
37 |
- chardet_package = 'chardet>=1.0.0' |
33 |
- packages.append('requests.packages.oreos') |
38 |
- requires.append('oauthlib>=0.1.0,<0.2.0') |
|
|
39 |
- |
40 |
-requires.append(chardet_package) |
34 |
+# FreeBSD ports tree, provides only chardet2 |
41 |
+# FreeBSD ports tree, provides only chardet2 |
35 |
+required = ['certifi>=0.0.7', 'chardet>=2.0.0'] |
42 |
+requires = ['certifi>=0.0.7', 'chardet>=2.0.0'] |
36 |
|
|
|
37 |
|
43 |
|
38 |
setup( |
44 |
# The async API in requests.async requires the gevent package. |
39 |
@@ -47,7 +33,7 @@ |
45 |
# This is also not a required dependency. |
|
|
46 |
@@ -62,7 +39,7 @@ |
40 |
author='Kenneth Reitz', |
47 |
author='Kenneth Reitz', |
41 |
author_email='me@kennethreitz.com', |
48 |
author_email='me@kennethreitz.com', |
42 |
url='http://python-requests.org', |
49 |
url='http://python-requests.org', |
Lines 44-47
Link Here
|
44 |
+ packages=find_packages(exclude=['requests.packages.url*']), |
51 |
+ packages=find_packages(exclude=['requests.packages.url*']), |
45 |
package_data={'': ['LICENSE', 'NOTICE']}, |
52 |
package_data={'': ['LICENSE', 'NOTICE']}, |
46 |
include_package_data=True, |
53 |
include_package_data=True, |
47 |
install_requires=required, |
54 |
install_requires=requires, |