diff options
author | Jacob Hoffman-Andrews <github@hoffman-andrews.com> | 2015-08-27 23:38:32 +0300 |
---|---|---|
committer | Jacob Hoffman-Andrews <github@hoffman-andrews.com> | 2015-08-27 23:38:32 +0300 |
commit | 70e311b43f6910c070dce3bab3396db495636d00 (patch) | |
tree | 208799272eb5714db9e1b8c382fd6ae99921a2c4 /letsencrypt-nginx/setup.py | |
parent | 89c94ccfbbca784eb8f28d036cc8c4dbb25dd750 (diff) |
Revert PR #708.
https://github.com/letsencrypt/letsencrypt/pull/708 broke the Boulder CI build
because Travis runs Ubuntu 12.04, which has an older setuptools. See
https://github.com/letsencrypt/boulder/issues/681.
Diffstat (limited to 'letsencrypt-nginx/setup.py')
-rw-r--r-- | letsencrypt-nginx/setup.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/letsencrypt-nginx/setup.py b/letsencrypt-nginx/setup.py index 64742e7b6..92b974974 100644 --- a/letsencrypt-nginx/setup.py +++ b/letsencrypt-nginx/setup.py @@ -1,5 +1,3 @@ -import sys - from setuptools import setup from setuptools import find_packages @@ -8,14 +6,10 @@ install_requires = [ 'acme', 'letsencrypt', 'pyparsing>=1.5.5', # Python3 support; perhaps unnecessary? + 'mock<1.1.0', # py26 'zope.interface', ] -if sys.version_info < (2, 7): - install_requires.append('mock<1.1.0') -else: - install_requires.append('mock') - setup( name='letsencrypt-nginx', packages=find_packages(), |