Build wheel

sebastinas · sebastinas · commit 7a225890c203 · 2015-02-28T22:19:55.000+01:00
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at> (cherry picked from commit 8aa4ddf) (cherry picked from commit 886e8e0) (cherry picked from commit 1caf243)
diff --git a/README.rst b/README.rst
@@ -18,12 +18,10 @@ Dependencies
 * watchdog (optional, for monitoring imported modules for changes)
 * jedi (optional, for experimental multiline completion)
 
-If you are using Python 2 on Mac OS X, the following dependencies are required
-as well:
+If you are using Python 2 before 2.7.7, the following dependency is also
+required:
 
-* pyOpenSSL
-* ndg-httpsclien
-* pyasn1
+* requests[security]
 
 If you have problems installing cffi which is needed by pyOpenSSL,
 please take a look at https://cffi.readthedocs.org/en/release-0.8/#macos-x.
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -220,6 +220,17 @@ def initialize_options(self):
     'urwid': ['urwid'],
     'watch': ['watchdog'],
     'jedi': ['jedi'],
+    # need requests[security] for SNI support (only before 2.7.7)
+    ':python_version == "2.6" or '
+            'python_full_version == "2.7.0" or ' \
+            'python_full_version == "2.7.1" or ' \
+            'python_full_version == "2.7.2" or ' \
+            'python_full_version == "2.7.3" or ' \
+            'python_full_version == "2.7.4" or ' \
+            'python_full_version == "2.7.5" or ' \
+            'python_full_version == "2.7.6"': [
+        'requests[security]'
+    ]
 }
 
 packages = [
@@ -240,14 +251,6 @@ def initialize_options(self):
     ]
 }
 
-if sys.version_info[0] == 2 and sys.platform == "darwin":
-    # need PyOpenSSL for SNI support (only 2.X and on Darwin)
-    # list of packages taken from
-    # https://github.com/kennethreitz/requests/blob/master/requests/packages/urllib3/contrib/pyopenssl.py
-    install_requires.append('PyOpenSSL')
-    install_requires.append('ndg-httpsclient')
-    install_requires.append('pyasn1')
-
 tests_require = []
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     tests_require.append('unittest2')
