diff options
author | Jakub Warmuz <jakub@warmuz.org> | 2015-08-28 09:40:19 +0300 |
---|---|---|
committer | Jakub Warmuz <jakub@warmuz.org> | 2015-08-28 09:40:19 +0300 |
commit | a74eff5fbd4f68a584bff9d2805f28954d95f978 (patch) | |
tree | f3aa99e941da70c466fa848a65d9fffe8b19e163 /setup.py | |
parent | 05d5d4ad96af70611b0f56b04a992300384f5d42 (diff) |
Revert "Revert PR #708."
This reverts commit 70e311b43f6910c070dce3bab3396db495636d00.
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -34,7 +34,6 @@ install_requires = [ 'ConfigArgParse', 'configobj', 'cryptography>=0.7', # load_pem_x509_certificate - 'mock<1.1.0', # py26 'parsedatetime', 'psutil>=2.1.0', # net_connections introduced in 2.1.0 'PyOpenSSL', @@ -47,8 +46,13 @@ install_requires = [ # env markers in extras_require cause problems with older pip: #517 if sys.version_info < (2, 7): - # only some distros recognize stdlib argparse as already satisfying - install_requires.append('argparse') + install_requires.extend([ + # only some distros recognize stdlib argparse as already satisfying + 'argparse', + 'mock<1.1.0', + ]) +else: + install_requires.append('mock') dev_extras = [ # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289 |