diff options
author | bmw <bmw@users.noreply.github.com> | 2015-08-27 19:22:16 +0300 |
---|---|---|
committer | bmw <bmw@users.noreply.github.com> | 2015-08-27 19:22:16 +0300 |
commit | ed509d15b2892e96bd50e319c2f1939180cd0bc1 (patch) | |
tree | b195f2d8ed30d8653bf6501c8ce8e0c57364b205 /setup.py | |
parent | c45901e686449d24f019aa6714a8e7cd1eb03b36 (diff) | |
parent | 217b40379f9759f3aa3c7d98d0dc9415eb9f04b4 (diff) |
Merge pull request #708 from kuba/mock-2.6
mock<1.1.0 only for py2.6.
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 |