Commit 7a22589
committed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -18,12 +18,10 @@ Dependencies | |||
| 18 | 18 | * watchdog (optional, for monitoring imported modules for changes) | |
| 19 | 19 | * jedi (optional, for experimental multiline completion) | |
| 20 | 20 | ||
| 21 | - If you are using Python 2 on Mac OS X, the following dependencies are required | ||
| 22 | - as well: | ||
| 21 | + If you are using Python 2 before 2.7.7, the following dependency is also | ||
| 22 | + required: | ||
| 23 | 23 | ||
| 24 | - * pyOpenSSL | ||
| 25 | - * ndg-httpsclien | ||
| 26 | - * pyasn1 | ||
| 24 | + * requests[security] | ||
| 27 | 25 | ||
| 28 | 26 | If you have problems installing cffi which is needed by pyOpenSSL, | |
| 29 | 27 | please take a look at https://cffi.readthedocs.org/en/release-0.8/#macos-x. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,2 @@ | |||
| 1 | + [bdist_wheel] | ||
| 2 | + universal = 1 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -220,6 +220,17 @@ def initialize_options(self): | |||
| 220 | 220 | 'urwid': ['urwid'], | |
| 221 | 221 | 'watch': ['watchdog'], | |
| 222 | 222 | 'jedi': ['jedi'], | |
| 223 | + # need requests[security] for SNI support (only before 2.7.7) | ||
| 224 | + ':python_version == "2.6" or ' | ||
| 225 | + 'python_full_version == "2.7.0" or ' \ | ||
| 226 | + 'python_full_version == "2.7.1" or ' \ | ||
| 227 | + 'python_full_version == "2.7.2" or ' \ | ||
| 228 | + 'python_full_version == "2.7.3" or ' \ | ||
| 229 | + 'python_full_version == "2.7.4" or ' \ | ||
| 230 | + 'python_full_version == "2.7.5" or ' \ | ||
| 231 | + 'python_full_version == "2.7.6"': [ | ||
| 232 | + 'requests[security]' | ||
| 233 | + ] | ||
| 223 | 234 | } | |
| 224 | 235 | ||
| 225 | 236 | packages = [ | |
@@ -240,14 +251,6 @@ def initialize_options(self): | |||
| 240 | 251 | ] | |
| 241 | 252 | } | |
| 242 | 253 | ||
| 243 | - if sys.version_info[0] == 2 and sys.platform == "darwin": | ||
| 244 | - # need PyOpenSSL for SNI support (only 2.X and on Darwin) | ||
| 245 | - # list of packages taken from | ||
| 246 | - # https://github.com/kennethreitz/requests/blob/master/requests/packages/urllib3/contrib/pyopenssl.py | ||
| 247 | - install_requires.append('PyOpenSSL') | ||
| 248 | - install_requires.append('ndg-httpsclient') | ||
| 249 | - install_requires.append('pyasn1') | ||
| 250 | - | ||
| 251 | 254 | tests_require = [] | |
| 252 | 255 | if sys.version_info[0] == 2 and sys.version_info[1] < 7: | |
| 253 | 256 | tests_require.append('unittest2') | |
0 commit comments