2015-07-31 13:39:24 +02:00
|
|
|
--- setup.py.orig 2015-07-31 13:36:41.178495452 +0200
|
|
|
|
+++ setup.py 2015-07-31 13:36:59.438576404 +0200
|
|
|
|
@@ -6,16 +6,16 @@
|
2014-02-26 20:04:35 +01:00
|
|
|
import awscli
|
|
|
|
|
|
|
|
|
2015-07-31 13:39:24 +02:00
|
|
|
-requires = ['botocore==1.1.5',
|
2015-05-28 00:33:00 +02:00
|
|
|
- 'colorama>=0.2.5,<=0.3.3',
|
2014-02-26 20:04:35 +01:00
|
|
|
- 'docutils>=0.10',
|
2015-05-28 00:33:00 +02:00
|
|
|
- 'rsa>=3.1.2,<=3.1.4']
|
2015-07-31 13:39:24 +02:00
|
|
|
+#requires = ['botocore==1.1.5',
|
2015-05-28 00:33:00 +02:00
|
|
|
+# 'colorama>=0.2.5,<=0.3.3',
|
2014-02-26 20:04:35 +01:00
|
|
|
+# 'docutils>=0.10',
|
2015-05-28 00:33:00 +02:00
|
|
|
+# 'rsa>=3.1.2,<=3.1.4']
|
2014-02-26 20:04:35 +01:00
|
|
|
|
2015-07-31 13:39:24 +02:00
|
|
|
|
2014-02-26 20:04:35 +01:00
|
|
|
-if sys.version_info[:2] == (2, 6):
|
|
|
|
- # For python2.6 we have to require argparse since it
|
|
|
|
- # was not in stdlib until 2.7.
|
|
|
|
- requires.append('argparse>=1.1')
|
|
|
|
+#if sys.version_info[:2] == (2, 6):
|
|
|
|
+# # For python2.6 we have to require argparse since it
|
|
|
|
+# # was not in stdlib until 2.7.
|
|
|
|
+# requires.append('argparse>=1.1')
|
|
|
|
|
|
|
|
|
|
|
|
setup_options = dict(
|
2015-07-31 13:39:24 +02:00
|
|
|
@@ -31,7 +31,7 @@
|
2014-02-26 20:04:35 +01:00
|
|
|
package_data={'awscli': ['data/*.json', 'examples/*/*.rst',
|
2015-05-28 00:33:00 +02:00
|
|
|
'examples/*/*/*.rst', 'topics/*.rst',
|
|
|
|
'topics/*.json']},
|
2014-02-26 20:04:35 +01:00
|
|
|
- install_requires=requires,
|
|
|
|
+# install_requires=requires,
|
2015-07-31 13:39:24 +02:00
|
|
|
extras_require={
|
|
|
|
':python_version=="2.6"': [
|
|
|
|
'argparse>=1.1',
|