Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/certbot/certbot.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Hoffman-Andrews <github@hoffman-andrews.com>2015-08-27 23:38:32 +0300
committerJacob Hoffman-Andrews <github@hoffman-andrews.com>2015-08-27 23:38:32 +0300
commit70e311b43f6910c070dce3bab3396db495636d00 (patch)
tree208799272eb5714db9e1b8c382fd6ae99921a2c4 /letsencrypt-compatibility-test/setup.py
parent89c94ccfbbca784eb8f28d036cc8c4dbb25dd750 (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-compatibility-test/setup.py')
-rw-r--r--letsencrypt-compatibility-test/setup.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/letsencrypt-compatibility-test/setup.py b/letsencrypt-compatibility-test/setup.py
index 99e66f54f..f02041e55 100644
--- a/letsencrypt-compatibility-test/setup.py
+++ b/letsencrypt-compatibility-test/setup.py
@@ -1,5 +1,3 @@
-import sys
-
from setuptools import setup
from setuptools import find_packages
@@ -9,14 +7,10 @@ install_requires = [
'letsencrypt-apache',
'letsencrypt-nginx',
'docker-py',
+ '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-compatibility-test',
packages=find_packages(),