diff --git a/.travis.yml b/.travis.yml index 52595c111..bfc484fbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ matrix: env: TOXENV=mypy <<: *not-on-master - python: "2.7" - env: TOXENV='py27-{acme,apache,certbot,dns,nginx,postfix}-oldest' + env: TOXENV='py27-{acme,apache,certbot,dns,nginx}-oldest' sudo: required services: docker <<: *not-on-master diff --git a/certbot/plugins/disco.py b/certbot/plugins/disco.py index 4b8e9f7ab..ec2bff8b7 100644 --- a/certbot/plugins/disco.py +++ b/certbot/plugins/disco.py @@ -39,7 +39,6 @@ class PluginEntryPoint(object): "certbot-dns-route53", "certbot-dns-sakuracloud", "certbot-nginx", - "certbot-postfix", ] """Distributions for which prefix will be omitted.""" diff --git a/tools/_venv_common.py b/tools/_venv_common.py index 1594fd05f..ac3b5f98d 100644 --- a/tools/_venv_common.py +++ b/tools/_venv_common.py @@ -39,7 +39,6 @@ REQUIREMENTS = [ '-e certbot-dns-route53', '-e certbot-dns-sakuracloud', '-e certbot-nginx', - '-e certbot-postfix', '-e letshelp-certbot', '-e certbot-compatibility-test', '-e certbot-ci', diff --git a/tools/install_and_test.py b/tools/install_and_test.py index 288226527..6987cf2b1 100755 --- a/tools/install_and_test.py +++ b/tools/install_and_test.py @@ -14,8 +14,7 @@ import shutil import subprocess import re -SKIP_PROJECTS_ON_WINDOWS = [ - 'certbot-apache', 'certbot-postfix', 'letshelp-certbot'] +SKIP_PROJECTS_ON_WINDOWS = ['certbot-apache', 'letshelp-certbot'] def call_with_print(command, cwd=None): diff --git a/tox.cover.py b/tox.cover.py index d0f97626a..65dc4a8a9 100755 --- a/tox.cover.py +++ b/tox.cover.py @@ -9,7 +9,7 @@ DEFAULT_PACKAGES = [ 'certbot_dns_digitalocean', 'certbot_dns_dnsimple', 'certbot_dns_dnsmadeeasy', 'certbot_dns_gehirn', 'certbot_dns_google', 'certbot_dns_linode', 'certbot_dns_luadns', 'certbot_dns_nsone', 'certbot_dns_ovh', 'certbot_dns_rfc2136', 'certbot_dns_route53', - 'certbot_dns_sakuracloud', 'certbot_nginx', 'certbot_postfix', 'letshelp_certbot'] + 'certbot_dns_sakuracloud', 'certbot_nginx', 'letshelp_certbot'] COVER_THRESHOLDS = { 'certbot': {'linux': 98, 'windows': 93}, @@ -30,12 +30,10 @@ COVER_THRESHOLDS = { 'certbot_dns_route53': {'linux': 92, 'windows': 92}, 'certbot_dns_sakuracloud': {'linux': 97, 'windows': 97}, 'certbot_nginx': {'linux': 97, 'windows': 97}, - 'certbot_postfix': {'linux': 100, 'windows': 100}, 'letshelp_certbot': {'linux': 100, 'windows': 100} } -SKIP_PROJECTS_ON_WINDOWS = [ - 'certbot-apache', 'certbot-postfix', 'letshelp-certbot'] +SKIP_PROJECTS_ON_WINDOWS = ['certbot-apache', 'letshelp-certbot'] def cover(package): diff --git a/tox.ini b/tox.ini index 52ae1e97d..fed30976f 100644 --- a/tox.ini +++ b/tox.ini @@ -35,7 +35,6 @@ all_packages = certbot-apache \ {[base]dns_packages} \ certbot-nginx \ - certbot-postfix \ letshelp-certbot install_packages = python {toxinidir}/tools/pip_install_editable.py {[base]all_packages} @@ -59,7 +58,6 @@ source_paths = certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud certbot-nginx/certbot_nginx - certbot-postfix/certbot_postfix letshelp-certbot/letshelp_certbot tests/lock_test.py @@ -111,12 +109,6 @@ commands = setenv = {[testenv:py27-oldest]setenv} -[testenv:py27-postfix-oldest] -commands = - {[base]install_and_test} certbot-postfix -setenv = - {[testenv:py27-oldest]setenv} - [testenv:py27-cover] basepython = python2.7 commands =