From 684f274c9db1d31edfbf81132a907af69ec948dd Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 2 Mar 2018 19:14:21 -0800 Subject: [PATCH] Revert "add pytest dev dependency" This reverts commit 42cb347f80c772aea1bb96c65c0cab1000782c5e. --- certbot-apache/setup.py | 6 ------ certbot-dns-cloudflare/setup.py | 6 ------ certbot-dns-cloudxns/setup.py | 6 ------ certbot-dns-digitalocean/setup.py | 6 ------ certbot-dns-dnsimple/setup.py | 6 ------ certbot-dns-dnsmadeeasy/setup.py | 6 ------ certbot-dns-google/setup.py | 6 ------ certbot-dns-luadns/setup.py | 6 ------ certbot-dns-nsone/setup.py | 6 ------ certbot-dns-rfc2136/setup.py | 6 ------ certbot-dns-route53/setup.py | 8 -------- certbot-nginx/setup.py | 6 ------ tox.ini | 20 ++++++++++---------- 13 files changed, 10 insertions(+), 84 deletions(-) diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index 0e881a46c..7608c0647 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -18,11 +18,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -62,7 +57,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index 0fc61bd44..4ed8e796d 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index 8d8c0b7dd..7f973709c 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index c60ea3820..0ce91e64e 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -18,11 +18,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -62,7 +57,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index cd558b534..d12b26d83 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index e55f0dfd9..856eaba0f 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index c8bf50840..0dfff0402 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -22,11 +22,6 @@ install_requires = [ 'httplib2' ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -66,7 +61,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index b545e6a2b..b255691dc 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index d619d68d4..68d8f6cdb 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index 8145676c1..3d6b3799b 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -17,11 +17,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -61,7 +56,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index 8671863f2..ad20725b5 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -16,11 +16,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - setup( name='certbot-dns-route53', version=version, @@ -54,9 +49,6 @@ setup( include_package_data=True, install_requires=install_requires, keywords=['certbot', 'route53', 'aws'], - extras_require={ - 'dev': dev_extras, - }, entry_points={ 'certbot.plugins': [ 'dns-route53 = certbot_dns_route53.dns_route53:Authenticator', diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index fa9836f94..bb71cf19a 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -21,11 +21,6 @@ install_requires = [ 'zope.interface', ] -dev_extras = [ - 'pytest', - 'pytest-xdist', -] - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', @@ -65,7 +60,6 @@ setup( include_package_data=True, install_requires=install_requires, extras_require={ - 'dev': dev_extras, 'docs': docs_extras, }, entry_points={ diff --git a/tox.ini b/tox.ini index 32545e04d..049220bbb 100644 --- a/tox.ini +++ b/tox.ini @@ -15,16 +15,16 @@ pip_install = {toxinidir}/tools/pip_install_editable.sh # to a specific version for increased stability for developers. install_and_test = {toxinidir}/tools/install_and_test.sh dns_packages = - certbot-dns-cloudflare[dev] \ - certbot-dns-cloudxns[dev] \ - certbot-dns-digitalocean[dev] \ - certbot-dns-dnsimple[dev] \ - certbot-dns-dnsmadeeasy[dev] \ - certbot-dns-google[dev] \ - certbot-dns-luadns[dev] \ - certbot-dns-nsone[dev] \ - certbot-dns-rfc2136[dev] \ - certbot-dns-route53[dev] + certbot-dns-cloudflare \ + certbot-dns-cloudxns \ + certbot-dns-digitalocean \ + certbot-dns-dnsimple \ + certbot-dns-dnsmadeeasy \ + certbot-dns-google \ + certbot-dns-luadns \ + certbot-dns-nsone \ + certbot-dns-rfc2136 \ + certbot-dns-route53 all_packages = acme[dev] \ .[dev] \