Checkbox

1	=== modified file 'plainbox/setup.py'
2	--- plainbox/setup.py 2016-06-20 02:02:13 +0000
3	+++ plainbox/setup.py 2016-07-04 15:14:32 +0000
4	@@ -21,7 +21,6 @@
5	import os
6
7	from setuptools import setup, find_packages
8	-from distutils.version import LooseVersion
9
10	if "test" in sys.argv:
11	# Reset locale for setup.py test
12	@@ -38,17 +37,6 @@
13	# Check if we are running on readthedocs.org builder.
14	on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
15
16	-# Check if we're able to include OAuth support
17	-try:
18	- import requests
19	-except ImportError:
20	- extra_install_requires = ['requests >= 1.0']
21	-else:
22	- if LooseVersion(requests.__version__) >= LooseVersion('2.0.0'):
23	- extra_install_requires = ['requests >= 2.0.0', 'requests-oauthlib']
24	- else:
25	- extra_install_requires = ['requests >= 1.0']
26	-
27	setup(
28	name="plainbox",
29	version="0.29.dev0",
30	@@ -86,7 +74,8 @@
31	'Jinja2 >= 2.7',
32	'guacamole >= 0.9',
33	'padme >= 1.1.1',
34	- ] + extra_install_requires,
35	+ 'requests >= 1.0',
36	+ ],
37	extras_require={
38	'XLSX': 'XlsxWriter >= 0.3',
39	},

Merge lp:~kissiel/checkbox/fix-1598741-remove-oauth into lp:checkbox