crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2025-08-08 04:02:10 +03:00
Code Activity

Build wheels correctly for Python 2.6 (#4313)

Browse Source 
* stop conditionally pinning mock version in acme

* stop conditionally pinning mock version in certbot

* stop conditionally pinning mock version in apache

* stop conditionally pinning mock version in nginx

* stop conditionally pinning mock version in letshelp

* stop conditionally pinning mock version in compatibility-test
This commit is contained in:
Brad Warren
2017-03-10 10:58:03 -08:00
committed by GitHub
parent 8f10103496
commit 662c323b55
6 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acme/setup.py
View File

@@ -13,6 +13,7 @@ install_requires = [
# rsa_recover_prime_factors (>=0.8) # rsa_recover_prime_factors (>=0.8)
'cryptography>=0.8', 'cryptography>=0.8',
# Connection.set_tlsext_host_name (>=0.13) # Connection.set_tlsext_host_name (>=0.13)
'mock',
'PyOpenSSL>=0.13', 'PyOpenSSL>=0.13',
'pyrfc3339', 'pyrfc3339',
'pytz', 'pytz',
@@ -27,15 +28,6 @@ install_requires = [
'six', 'six',
] ]
# env markers in extras_require cause problems with older pip: #517
# Keep in sync with conditional_requirements.py.
if sys.version_info < (2, 7):
install_requires.extend([
'mock<1.1.0',
])
else:
install_requires.append('mock')
dev_extras = [ dev_extras = [
'nose', 'nose',
'tox', 'tox',

6
certbot-apache/setup.py
View File

@@ -10,6 +10,7 @@ version = '0.13.0.dev0'
install_requires = [ install_requires = [
'acme=={0}'.format(version), 'acme=={0}'.format(version),
'certbot=={0}'.format(version), 'certbot=={0}'.format(version),
'mock',
'python-augeas', 'python-augeas',
# For pkg_resources. >=1.0 so pip resolves it to a version cryptography # For pkg_resources. >=1.0 so pip resolves it to a version cryptography
# will tolerate; see #2599: # will tolerate; see #2599:
@@ -18,11 +19,6 @@ install_requires = [
'zope.interface', 'zope.interface',
] ]
if sys.version_info < (2, 7):
install_requires.append('mock<1.1.0')
else:
install_requires.append('mock')
docs_extras = [ docs_extras = [
'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags
'sphinx_rtd_theme', 'sphinx_rtd_theme',

6
certbot-compatibility-test/setup.py
View File

@@ -9,16 +9,12 @@ version = '0.13.0.dev0'
install_requires = [ install_requires = [
'certbot', 'certbot',
'certbot-apache', 'certbot-apache',
'mock',
'six', 'six',
'requests', 'requests',
'zope.interface', 'zope.interface',
] ]
if sys.version_info < (2, 7):
install_requires.append('mock<1.1.0')
else:
install_requires.append('mock')
if sys.version_info < (2, 7, 9): if sys.version_info < (2, 7, 9):
# For secure SSL connexion with Python 2.7 (InsecurePlatformWarning) # For secure SSL connexion with Python 2.7 (InsecurePlatformWarning)
install_requires.append('ndg-httpsclient') install_requires.append('ndg-httpsclient')

6
certbot-nginx/setup.py
View File

@@ -10,6 +10,7 @@ version = '0.13.0.dev0'
install_requires = [ install_requires = [
'acme=={0}'.format(version), 'acme=={0}'.format(version),
'certbot=={0}'.format(version), 'certbot=={0}'.format(version),
'mock',
'PyOpenSSL', 'PyOpenSSL',
'pyparsing>=1.5.5', # Python3 support; perhaps unnecessary? 'pyparsing>=1.5.5', # Python3 support; perhaps unnecessary?
# For pkg_resources. >=1.0 so pip resolves it to a version cryptography # For pkg_resources. >=1.0 so pip resolves it to a version cryptography
@@ -18,11 +19,6 @@ install_requires = [
'zope.interface', 'zope.interface',
] ]
if sys.version_info < (2, 7):
install_requires.append('mock<1.1.0')
else:
install_requires.append('mock')
docs_extras = [ docs_extras = [
'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags
'sphinx_rtd_theme', 'sphinx_rtd_theme',

5
letshelp-certbot/setup.py
View File

@@ -7,12 +7,9 @@ from setuptools import find_packages
version = '0.7.0.dev0' version = '0.7.0.dev0'
install_requires = [ install_requires = [
'mock',
'setuptools', # pkg_resources 'setuptools', # pkg_resources
] ]
if sys.version_info < (2, 7):
install_requires.append('mock<1.1.0')
else:
install_requires.append('mock')
docs_extras = [ docs_extras = [
'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags

10
setup.py
View File

@@ -43,6 +43,7 @@ install_requires = [
'ConfigArgParse>=0.9.3', 'ConfigArgParse>=0.9.3',
'configobj', 'configobj',
'cryptography>=0.7', # load_pem_x509_certificate 'cryptography>=0.7', # load_pem_x509_certificate
'mock',
'parsedatetime>=1.3', # Calendar.parseDT 'parsedatetime>=1.3', # Calendar.parseDT
'PyOpenSSL', 'PyOpenSSL',
'pyrfc3339', 'pyrfc3339',
@@ -55,15 +56,6 @@ install_requires = [
'zope.interface', 'zope.interface',
] ]
# env markers in extras_require cause problems with older pip: #517
# Keep in sync with conditional_requirements.py.
if sys.version_info < (2, 7):
install_requires.extend([
'mock<1.1.0',
])
else:
install_requires.append('mock')
dev_extras = [ dev_extras = [
# Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289 # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
'astroid==1.3.5', 'astroid==1.3.5',