From 35f6671ec583e75b90a026167e18cb41cdb7d760 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Thu, 28 Jun 2012 16:00:34 -0700 Subject: [PATCH] new vendored libs --- setup.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/setup.py b/setup.py index f80e415..d8bcceb 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ import os import sys import requests -from requests.compat import is_py3 +from requests.compat import is_py2 try: from setuptools import setup @@ -24,28 +24,18 @@ if sys.argv[-1] == 'publish': packages = [ 'requests', 'requests.packages', + 'requests.packages.chardet', + 'requests.packages.chardet2', 'requests.packages.urllib3', 'requests.packages.urllib3.packages', 'requests.packages.urllib3.packages.ssl_match_hostname', ] -# certifi is a Python package containing a CA certificate bundle for SSL verification. -# On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can -# use the system CA bundle instead; see `requests.utils` for details. -# If your platform is supported, set `requires` to [] instead: -requires = ['certifi>=0.0.7'] +requires = [] -# chardet is used to optimally guess the encodings of pages that don't declare one. -# At this time, chardet is not a required dependency. However, it's sufficiently -# important that pip/setuptools should install it when it's unavailable. -if is_py3: - chardet_package = 'chardet2' -else: - chardet_package = 'chardet>=1.0.0' +if is_py2: requires.append('oauthlib>=0.1.0,<0.2.0') -requires.append(chardet_package) - setup( name='requests', version=requests.__version__, @@ -56,7 +46,8 @@ setup( author_email='me@kennethreitz.com', url='http://python-requests.org', packages=packages, - package_data={'': ['LICENSE', 'NOTICE']}, + package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']}, + package_dir={'requests': 'requests'}, include_package_data=True, install_requires=requires, license=open("LICENSE").read(), -- 2.34.1