mirror of
https://github.com/certbot/certbot.git
synced 2026-08-02 00:22:28 +02:00
merge certbot-apache and certbot-nginx into certbot (#10522)
based on the suggestion @bmw made in #10484, this moves nearly everything from `certbot-apache` and `certbot-nginx` into subdirectories in `certbot/src/certbot/_internal`, and corresponding "extra" dependencies are made for the certbot distribution. in their place, entrypoint shims are made in the old distributions. this way, installing `certbot[nginx]` will pull in the extra dependencies needed for the nginx code, and also pull in the shim in `certbot-nginx`, letting our plugin discovery system work just as it did before. ditto for apache. note that this doesn't yet deprecate anything, which was one of the primary goals of the original issue -- i spun out that work into #10521 fixes #10484 --------- Co-authored-by: Brad Warren <bmw@users.noreply.github.com> Co-authored-by: ohemorange <erica@eff.org>
This commit is contained in:
Will Greenberg
co-authored by
Brad Warren
ohemorange
Brad Warren
ohemorange
parent
9599364837
commit
6f1c0b0abd
@@ -24,7 +24,7 @@ deps =
|
||||
-e acme[test]
|
||||
-e certbot
|
||||
-e certbot[test]
|
||||
-e certbot-apache[dev]
|
||||
-e certbot-apache
|
||||
-e certbot-dns-cloudflare
|
||||
-e certbot-dns-digitalocean
|
||||
-e certbot-dns-dnsimple
|
||||
@@ -50,7 +50,7 @@ commands =
|
||||
|
||||
[testenv:py{,-posix}]
|
||||
commands =
|
||||
{[base]pytest} acme certbot certbot-dns-cloudflare 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-apache
|
||||
{[base]pytest} acme certbot certbot-dns-cloudflare 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
|
||||
|
||||
[testenv:py3{,10,11,12,13,14}]
|
||||
commands = {[testenv:py]commands}
|
||||
@@ -87,12 +87,10 @@ common_coverage_report_commands =
|
||||
{[testenv:cover]coverage_report} --fail-under 99 --include certbot-dns-rfc2136/*
|
||||
{[testenv:cover]coverage_report} --fail-under 94 --include certbot-dns-route53/*
|
||||
{[testenv:cover]coverage_report} --fail-under 99 --include certbot-dns-sakuracloud/*
|
||||
{[testenv:cover]coverage_report} --fail-under 98 --include certbot-nginx/*
|
||||
commands =
|
||||
{[testenv:py]commands} --cov --cov-report=
|
||||
{[testenv:cover]coverage_report} --fail-under 100 --include acme/*
|
||||
{[testenv:cover]coverage_report} --fail-under 95 --include certbot/*
|
||||
{[testenv:cover]coverage_report} --fail-under 100 --include certbot-apache/*
|
||||
{[testenv:cover]coverage_report} --fail-under 96 --include certbot/*
|
||||
{[testenv:cover]common_coverage_report_commands}
|
||||
|
||||
# Another workaround for https://github.com/tox-dev/tox/issues/2858 in tox v4.
|
||||
@@ -119,16 +117,16 @@ commands = {[base]pytest} acme
|
||||
|
||||
[testenv:isolated-certbot]
|
||||
description = Tests Certbot without any additional plugins installed
|
||||
commands = {[base]pytest} certbot
|
||||
deps =
|
||||
{[testenv:isolated-acme]deps}
|
||||
-e certbot[test]
|
||||
commands = {[base]pytest} certbot
|
||||
|
||||
[testenv:isolated-{apache,cloudflare,digitalocean,dnsimple,dnsmadeeasy,gehirn,google,linode,luadns,nsone,ovh,rfc2136,route53,sakuracloud,nginx}]
|
||||
description = Tests the plugin without installing any other plugins
|
||||
deps =
|
||||
{[testenv:isolated-certbot]deps}
|
||||
apache: -e certbot-apache[dev]
|
||||
apache: -e certbot-apache
|
||||
cloudflare: -e certbot-dns-cloudflare
|
||||
digitalocean: -e certbot-dns-digitalocean
|
||||
dnsimple: -e certbot-dns-dnsimple
|
||||
@@ -144,7 +142,7 @@ deps =
|
||||
sakuracloud: -e certbot-dns-sakuracloud
|
||||
nginx: -e certbot-nginx
|
||||
commands =
|
||||
apache: {[base]pytest} certbot-apache
|
||||
apache: {[base]pytest} certbot/src/certbot/_internal/tests/plugins/apache
|
||||
cloudflare: {[base]pytest} certbot-dns-cloudflare
|
||||
digitalocean: {[base]pytest} certbot-dns-digitalocean
|
||||
dnsimple: {[base]pytest} certbot-dns-dnsimple
|
||||
@@ -158,7 +156,7 @@ commands =
|
||||
rfc2136: {[base]pytest} certbot-dns-rfc2136
|
||||
route53: {[base]pytest} certbot-dns-route53
|
||||
sakuracloud: {[base]pytest} certbot-dns-sakuracloud
|
||||
nginx: {[base]pytest} certbot-nginx
|
||||
nginx: {[base]pytest} certbot/src/certbot/_internal/tests/plugins/nginx
|
||||
|
||||
[testenv:apacheconftest]
|
||||
deps =
|
||||
@@ -166,27 +164,27 @@ deps =
|
||||
-e certbot
|
||||
-e certbot-apache
|
||||
commands =
|
||||
{toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test --debian-modules
|
||||
{toxinidir}/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test --debian-modules
|
||||
passenv =
|
||||
SERVER
|
||||
allowlist_externals =
|
||||
{toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test
|
||||
{toxinidir}/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test
|
||||
|
||||
[testenv:apacheconftest-external-with-pebble]
|
||||
description = Run apacheconftest with pebble and Certbot outside of the tox virtual environment.
|
||||
deps =
|
||||
-e certbot-ci
|
||||
allowlist_externals =
|
||||
{toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py
|
||||
{toxinidir}/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test-pebble.py
|
||||
commands =
|
||||
{toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py --debian-modules
|
||||
{toxinidir}/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test-pebble.py --debian-modules
|
||||
|
||||
[testenv:apacheconftest-with-pebble]
|
||||
deps =
|
||||
{[testenv:apacheconftest]deps}
|
||||
{[testenv:apacheconftest-external-with-pebble]deps}
|
||||
allowlist_externals =
|
||||
{toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py
|
||||
{toxinidir}/certbot/src/certbot/_internal/tests/plugins/apache/apache-conf-files/apache-conf-test-pebble.py
|
||||
commands = {[testenv:apacheconftest-external-with-pebble]commands}
|
||||
|
||||
[testenv:nginxroundtrip]
|
||||
@@ -235,8 +233,7 @@ commands =
|
||||
{[base]pytest} certbot-ci/src/certbot_integration_tests \
|
||||
--cov=acme --cov=certbot --cov=certbot_nginx --cov-report= \
|
||||
--cov-config=certbot-ci/src/certbot_integration_tests/.coveragerc
|
||||
coverage report --include 'certbot/*' --show-missing --fail-under=65
|
||||
coverage report --include 'certbot-nginx/*' --show-missing --fail-under=74
|
||||
coverage report --include 'certbot/*' --show-missing --fail-under=71
|
||||
passenv = DOCKER_*
|
||||
|
||||
[testenv:integration-certbot]
|
||||
|
||||
Reference in New Issue
Block a user