Merge pull request #722 from kuba/mock-2.6

Revert "Revert PR #708."
This commit is contained in:
bmw
2015-10-06 11:05:32 -07:00
7 changed files with 40 additions and 12 deletions
+7 -1
View File
@@ -1,3 +1,5 @@
import sys
from setuptools import setup
from setuptools import find_packages
@@ -9,10 +11,14 @@ install_requires = [
'letsencrypt-apache=={0}'.format(version),
'letsencrypt-nginx=={0}'.format(version),
'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',
version=version,