From 16f858547fedb45c948e9f34b3215b550b42cc3d Mon Sep 17 00:00:00 2001 From: ohemorange Date: Fri, 11 Apr 2025 12:30:33 -0700 Subject: [PATCH] Add --use-pep517 flag to pip to silence warning in tools/venv.py, and switch codebase to src-layout (#10249) Fixes #10252. See further discussion here: https://github.com/pypa/pip/issues/11457 We are doing option: > Alternatively, enable the --use-pep517 pip option, possibly with --no-build-isolation. The --use-pip517 flag will force pip to use the modern mechanism for editable installs. --no-build-isolation may be needed if your project has build-time requirements beyond setuptools and wheel. By passing this flag, you are responsible for making sure your environment already has the required dependencies to build your package. Once the legacy mechanism is removed, --use-pep517 will have no effect and will essentially be enabled by default in this context. Major changes made here include: - Add `--use-pep517` to use the modern mechanism, which will be the only mechanism in future pip releases - Change to `/src` layout to appease mypy, and because for editable installs that really is the normal way these days. - `cd acme && mkdir src && mv acme src/` etc. - add `where='src'` argument to `find_packages` and add `package_dir={'': 'src'},` in `setup.py`s - update `MANIFEST.in` files with new path locations - Update our many hardcoded filepaths - Update `importlib-metadata` requirement to fix double-plugin-entry-point problem in oldest tests --- .../templates/jobs/packaging-jobs.yml | 2 +- .isort.cfg | 2 +- acme/MANIFEST.in | 4 +- acme/setup.py | 3 +- acme/{ => src}/acme/__init__.py | 0 acme/{ => src}/acme/_internal/__init__.py | 0 .../acme/_internal/tests/__init__.py | 0 .../acme/_internal/tests/challenges_test.py | 0 .../acme/_internal/tests/client_test.py | 0 .../acme/_internal/tests/crypto_util_test.py | 0 .../acme/_internal/tests/errors_test.py | 0 .../acme/_internal/tests/fields_test.py | 0 .../acme/_internal/tests/jose_test.py | 0 .../acme/_internal/tests/jws_test.py | 0 .../acme/_internal/tests/messages_test.py | 0 .../acme/_internal/tests/standalone_test.py | 0 .../acme/_internal/tests/test_util.py | 0 .../acme/_internal/tests/testdata/README | 0 .../_internal/tests/testdata/cert-100sans.pem | 0 .../_internal/tests/testdata/cert-idnsans.pem | 0 .../_internal/tests/testdata/cert-ipsans.pem | 0 .../tests/testdata/cert-ipv6sans.pem | 0 .../_internal/tests/testdata/cert-nocn.der | Bin .../_internal/tests/testdata/cert-san.pem | 0 .../acme/_internal/tests/testdata/cert.der | Bin .../acme/_internal/tests/testdata/cert.pem | 0 .../_internal/tests/testdata/critical-san.pem | 0 .../_internal/tests/testdata/csr-100sans.pem | 0 .../_internal/tests/testdata/csr-6sans.pem | 0 .../_internal/tests/testdata/csr-idnsans.pem | 0 .../_internal/tests/testdata/csr-ipsans.pem | 0 .../_internal/tests/testdata/csr-ipv6sans.pem | 0 .../_internal/tests/testdata/csr-mixed.pem | 0 .../_internal/tests/testdata/csr-nosans.pem | 0 .../acme/_internal/tests/testdata/csr-san.pem | 0 .../acme/_internal/tests/testdata/csr.der | Bin .../acme/_internal/tests/testdata/csr.pem | 0 .../_internal/tests/testdata/dsa512_key.pem | 0 .../tests/testdata/ec_secp384r1_key.pem | 0 .../_internal/tests/testdata/rsa1024_cert.pem | 0 .../_internal/tests/testdata/rsa1024_key.pem | 0 .../_internal/tests/testdata/rsa2048_cert.pem | 0 .../_internal/tests/testdata/rsa2048_key.pem | 0 .../_internal/tests/testdata/rsa256_key.pem | 0 .../_internal/tests/testdata/rsa4096_cert.pem | 0 .../_internal/tests/testdata/rsa4096_key.pem | 0 .../_internal/tests/testdata/rsa512_key.pem | 0 .../acme/_internal/tests/util_test.py | 0 acme/{ => src}/acme/challenges.py | 0 acme/{ => src}/acme/client.py | 0 acme/{ => src}/acme/crypto_util.py | 0 acme/{ => src}/acme/errors.py | 0 acme/{ => src}/acme/fields.py | 0 acme/{ => src}/acme/jws.py | 0 acme/{ => src}/acme/messages.py | 0 acme/{ => src}/acme/py.typed | 0 acme/{ => src}/acme/standalone.py | 0 acme/{ => src}/acme/util.py | 0 certbot-apache/MANIFEST.in | 8 +- certbot-apache/setup.py | 3 +- .../{ => src}/certbot_apache/__init__.py | 0 .../certbot_apache/_internal/__init__.py | 0 .../certbot_apache/_internal/apache_util.py | 0 .../certbot_apache/_internal/apacheparser.py | 0 .../certbot_apache/_internal/assertions.py | 0 .../_internal/augeas_lens/README | 0 .../_internal/augeas_lens/httpd.aug | 0 .../certbot_apache/_internal/augeasparser.py | 0 .../certbot_apache/_internal/configurator.py | 0 .../certbot_apache/_internal/constants.py | 0 .../certbot_apache/_internal/display_ops.py | 0 .../certbot_apache/_internal/dualparser.py | 0 .../certbot_apache/_internal/entrypoint.py | 0 .../certbot_apache/_internal/http_01.py | 0 .../certbot_apache/_internal/interfaces.py | 0 .../{ => src}/certbot_apache/_internal/obj.py | 0 .../_internal/override_alpine.py | 0 .../certbot_apache/_internal/override_arch.py | 0 .../_internal/override_centos.py | 0 .../_internal/override_darwin.py | 0 .../_internal/override_debian.py | 0 .../_internal/override_fedora.py | 0 .../_internal/override_gentoo.py | 0 .../certbot_apache/_internal/override_suse.py | 0 .../certbot_apache/_internal/override_void.py | 0 .../certbot_apache/_internal/parser.py | 0 .../_internal/parsernode_util.py | 0 .../_internal/tests/__init__.py | 0 .../tests/apache-conf-files/NEEDED.txt | 0 .../tests/apache-conf-files/apache-conf-test | 0 .../apache-conf-test-pebble.py | 0 .../failing/missing-double-quote-1724.conf | 0 .../failing/multivhost-1093.conf | 0 .../failing/multivhost-1093b.conf | 0 .../apache-conf-files/passing/1626-1531.conf | 0 .../apache-conf-files/passing/README.modules | 0 .../passing/anarcat-1531.conf | 0 .../passing/comment-continuations-2050.conf | 0 .../drupal-errordocument-arg-1724.conf | 0 .../passing/drupal-htaccess-1531.conf | 0 .../passing/escaped-space-arguments-2735.conf | 0 .../passing/example-1755.conf | 0 .../passing/example-ssl.conf | 0 .../apache-conf-files/passing/example.conf | 0 .../passing/finalize-1243.apache2.conf.txt | 0 .../passing/finalize-1243.conf | 0 .../passing/graphite-quote-1934.conf | 0 .../apache-conf-files/passing/ipv6-1143.conf | 0 .../apache-conf-files/passing/ipv6-1143b.conf | 0 .../apache-conf-files/passing/ipv6-1143c.conf | 0 .../apache-conf-files/passing/ipv6-1143d.conf | 0 .../passing/missing-quote-1724.conf | 0 .../passing/modmacro-1385.conf | 0 .../passing/owncloud-1264.conf | 0 .../passing/rewrite-quote-1960.conf | 0 .../passing/roundcube-1222.conf | 0 .../passing/section-continuations-2525.conf | 0 .../section-empty-continuations-2731.conf | 0 .../passing/semacode-1598.conf | 0 .../passing/sslrequire-wordlist-1827.htaccess | 0 .../passing/two-blocks-one-line-1693.conf | 0 .../_internal/tests/augeasnode_test.py | 0 .../_internal/tests/autohsts_test.py | 0 .../_internal/tests/centos_test.py | 0 .../_internal/tests/complex_parsing_test.py | 0 .../tests/configurator_reverter_test.py | 0 .../_internal/tests/configurator_test.py | 0 .../_internal/tests/debian_test.py | 0 .../_internal/tests/display_ops_test.py | 0 .../_internal/tests/dualnode_test.py | 0 .../_internal/tests/entrypoint_test.py | 0 .../_internal/tests/fedora_test.py | 0 .../_internal/tests/gentoo_test.py | 0 .../_internal/tests/http_01_test.py | 0 .../_internal/tests/obj_test.py | 0 .../_internal/tests/parser_test.py | 0 .../tests/parsernode_configurator_test.py | 0 .../_internal/tests/parsernode_test.py | 0 .../_internal/tests/parsernode_util_test.py | 0 .../centos7_apache/apache/httpd/conf.d/README | 0 .../apache/httpd/conf.d/autoindex.conf | 0 .../httpd/conf.d/centos.example.com.conf | 0 .../apache/httpd/conf.d/ssl.conf | 0 .../apache/httpd/conf.d/userdir.conf | 0 .../apache/httpd/conf.d/welcome.conf | 0 .../apache/httpd/conf.modules.d/00-base.conf | 0 .../apache/httpd/conf.modules.d/00-dav.conf | 0 .../apache/httpd/conf.modules.d/00-lua.conf | 0 .../apache/httpd/conf.modules.d/00-mpm.conf | 0 .../apache/httpd/conf.modules.d/00-proxy.conf | 0 .../apache/httpd/conf.modules.d/00-ssl.conf | 0 .../httpd/conf.modules.d/00-systemd.conf | 0 .../apache/httpd/conf.modules.d/01-cgi.conf | 0 .../apache/httpd/conf/httpd.conf | 0 .../centos7_apache/apache/httpd/conf/magic | 0 .../testdata/centos7_apache/apache/sites | 0 .../centos7_apache/apache/sysconfig/httpd | 0 .../testdata/complex_parsing/apache2.conf | 0 .../complex_parsing/conf-enabled/dummy.conf | 0 .../complex_parsing/test_fnmatch.conf | 0 .../complex_parsing/test_variables.conf | 0 .../augeas_vhosts/apache2/apache2.conf | 0 .../apache2/conf-available/bad_conf_file.conf | 0 .../other-vhosts-access-log.conf | 0 .../apache2/conf-available/security.conf | 0 .../apache2/conf-available/serve-cgi-bin.conf | 0 .../conf-enabled/other-vhosts-access-log.conf | 0 .../apache2/conf-enabled/security.conf | 0 .../apache2/conf-enabled/serve-cgi-bin.conf | 0 .../augeas_vhosts/apache2/envvars | 0 .../apache2/mods-available/authz_svn.load | 0 .../apache2/mods-available/dav.load | 0 .../apache2/mods-available/dav_svn.conf | 0 .../apache2/mods-available/dav_svn.load | 0 .../apache2/mods-available/rewrite.load | 0 .../apache2/mods-available/ssl.conf | 0 .../apache2/mods-available/ssl.load | 0 .../apache2/mods-enabled/authz_svn.load | 0 .../apache2/mods-enabled/dav.load | 0 .../apache2/mods-enabled/dav_svn.conf | 0 .../apache2/mods-enabled/dav_svn.load | 0 .../augeas_vhosts/apache2/ports.conf | 0 .../sites-available/another_wildcard.conf | 0 .../sites-available/old-and-default.conf | 0 .../apache2/sites-available/wildcard.conf | 0 .../sites-enabled/another_wildcard.conf | 0 .../sites-enabled/old-and-default.conf | 0 .../apache2/sites-enabled/wildcard.conf | 0 .../debian_apache_2_4/augeas_vhosts/sites | 0 .../default_vhost/apache2/apache2.conf | 0 .../other-vhosts-access-log.conf | 0 .../apache2/conf-available/security.conf | 0 .../apache2/conf-available/serve-cgi-bin.conf | 0 .../conf-enabled/other-vhosts-access-log.conf | 0 .../apache2/conf-enabled/security.conf | 0 .../apache2/conf-enabled/serve-cgi-bin.conf | 0 .../default_vhost/apache2/envvars | 0 .../apache2/mods-available/ssl.conf | 0 .../apache2/mods-available/ssl.load | 0 .../default_vhost/apache2/ports.conf | 0 .../apache2/sites-available/000-default.conf | 0 .../apache2/sites-available/default-ssl.conf | 0 .../apache2/sites-enabled/000-default.conf | 0 .../debian_apache_2_4/default_vhost/sites | 0 .../multi_vhosts/apache2/apache2.conf | 0 .../multi_vhosts/apache2/envvars | 0 .../multi_vhosts/apache2/ports.conf | 0 .../apache2/sites-available/default.conf | 0 .../apache2/sites-available/multi-vhost.conf | 0 .../apache2/sites-enabled/default.conf | 0 .../apache2/sites-enabled/multi-vhost.conf | 0 .../multiple_vhosts/apache2/apache2.conf | 0 .../apache2/conf-available/bad_conf_file.conf | 0 .../other-vhosts-access-log.conf | 0 .../apache2/conf-available/security.conf | 0 .../apache2/conf-available/serve-cgi-bin.conf | 0 .../conf-enabled/other-vhosts-access-log.conf | 0 .../apache2/conf-enabled/security.conf | 0 .../apache2/conf-enabled/serve-cgi-bin.conf | 0 .../multiple_vhosts/apache2/envvars | 0 .../apache2/mods-available/authz_svn.load | 0 .../apache2/mods-available/dav.load | 0 .../apache2/mods-available/dav_svn.conf | 0 .../apache2/mods-available/dav_svn.load | 0 .../apache2/mods-available/rewrite.load | 0 .../apache2/mods-available/ssl.conf | 0 .../apache2/mods-available/ssl.load | 0 .../apache2/mods-enabled/authz_svn.load | 0 .../apache2/mods-enabled/dav.load | 0 .../apache2/mods-enabled/dav_svn.conf | 0 .../apache2/mods-enabled/dav_svn.load | 0 .../multiple_vhosts/apache2/ports.conf | 0 .../apache2/sites-available/000-default.conf | 0 .../apache2/sites-available/certbot.conf | 0 .../default-ssl-port-only.conf | 0 .../apache2/sites-available/default-ssl.conf | 0 .../sites-available/duplicatehttp.conf | 0 .../sites-available/duplicatehttps.conf | 0 .../apache2/sites-available/empty.conf | 0 .../sites-available/encryption-example.conf | 0 .../sites-available/mod_macro-example.conf | 0 .../sites-available/no-directives.conf | 0 .../apache2/sites-available/ocsp-ssl.conf | 0 .../apache2/sites-available/wildcard.conf | 0 .../apache2/sites-enabled/000-default.conf | 0 .../apache2/sites-enabled/certbot.conf | 0 .../sites-enabled/default-ssl-port-only.conf | 0 .../apache2/sites-enabled/default-ssl.conf | 0 .../apache2/sites-enabled/duplicatehttp.conf | 0 .../apache2/sites-enabled/duplicatehttps.conf | 0 .../sites-enabled/encryption-example.conf | 0 .../sites-enabled/mod_macro-example.conf | 0 .../apache2/sites-enabled/non-symlink.conf | 0 .../apache2/sites-enabled/ocsp-ssl.conf | 0 .../apache2/sites-enabled/wildcard.conf | 0 .../debian_apache_2_4/multiple_vhosts/sites | 0 .../gentoo_apache/apache/apache2/httpd.conf | 0 .../gentoo_apache/apache/apache2/magic | 0 .../modules.d/00_default_settings.conf | 0 .../apache2/modules.d/00_error_documents.conf | 0 .../apache2/modules.d/00_languages.conf | 0 .../apache2/modules.d/00_mod_autoindex.conf | 0 .../apache/apache2/modules.d/00_mod_info.conf | 0 .../apache2/modules.d/00_mod_log_config.conf | 0 .../apache/apache2/modules.d/00_mod_mime.conf | 0 .../apache2/modules.d/00_mod_status.conf | 0 .../apache2/modules.d/00_mod_userdir.conf | 0 .../apache/apache2/modules.d/00_mpm.conf | 0 .../apache2/modules.d/10_mod_mem_cache.conf | 0 .../apache/apache2/modules.d/40_mod_ssl.conf | 0 .../apache2/modules.d/41_mod_http2.conf | 0 .../apache/apache2/modules.d/45_mod_dav.conf | 0 .../apache/apache2/modules.d/46_mod_ldap.conf | 0 .../vhosts.d/00_default_ssl_vhost.conf | 0 .../apache2/vhosts.d/00_default_vhost.conf | 0 .../apache2/vhosts.d/default_vhost.include | 0 .../apache2/vhosts.d/gentoo.example.com.conf | 0 .../gentoo_apache/apache/conf.d/apache2 | 0 .../tests/testdata/gentoo_apache/apache/sites | 0 .../certbot_apache/_internal/tests/util.py | 0 .../current-options-ssl-apache.conf | 0 .../tls_configs/old-options-ssl-apache.conf | 0 .../{ => src}/certbot_apache/py.typed | 0 certbot-ci/MANIFEST.in | 6 +- certbot-ci/setup.py | 3 +- .../certbot_integration_tests/.coveragerc | 0 .../certbot_integration_tests/__init__.py | 0 .../assets/bind-config/conf/named.conf | 0 .../rfc2136-credentials-default.ini.tpl | 0 .../assets/bind-config/zones/db.example.com | 0 .../bind-config/zones/db.sub.example.com | 0 .../bind-config/zones/rpz.mock-recursion | 0 .../certbot_integration_tests/assets/cert.pem | 0 .../certbot_integration_tests/assets/hook.py | 0 .../certbot_integration_tests/assets/key.pem | 0 .../meta.json | 0 .../private_key.json | 0 .../regr.json | 0 .../a.encryption-example.com/cert1.pem | 0 .../a.encryption-example.com/chain1.pem | 0 .../a.encryption-example.com/fullchain1.pem | 0 .../a.encryption-example.com/privkey1.pem | 0 .../b.encryption-example.com/cert1.pem | 0 .../b.encryption-example.com/chain1.pem | 0 .../b.encryption-example.com/fullchain1.pem | 0 .../b.encryption-example.com/privkey1.pem | 0 .../archive/c.encryption-example.com/README | 0 .../archive/c.encryption-example.com/cert.pem | 0 .../c.encryption-example.com/chain.pem | 0 .../c.encryption-example.com/fullchain.pem | 0 .../c.encryption-example.com/privkey.pem | 0 .../sample-config/csr/0000_csr-certbot.pem | 0 .../sample-config/csr/0001_csr-certbot.pem | 0 .../sample-config/csr/0002_csr-certbot.pem | 0 .../sample-config/csr/0003_csr-certbot.pem | 0 .../sample-config/keys/0000_key-certbot.pem | 0 .../sample-config/keys/0001_key-certbot.pem | 0 .../sample-config/keys/0002_key-certbot.pem | 0 .../sample-config/keys/0003_key-certbot.pem | 0 .../live/a.encryption-example.com/README | 0 .../live/a.encryption-example.com/cert.pem | 0 .../live/a.encryption-example.com/chain.pem | 0 .../a.encryption-example.com/fullchain.pem | 0 .../live/a.encryption-example.com/privkey.pem | 0 .../live/b.encryption-example.com/README | 0 .../live/b.encryption-example.com/cert.pem | 0 .../live/b.encryption-example.com/chain.pem | 0 .../b.encryption-example.com/fullchain.pem | 0 .../live/b.encryption-example.com/privkey.pem | 0 .../live/c.encryption-example.com/README | 0 .../live/c.encryption-example.com/cert.pem | 0 .../live/c.encryption-example.com/chain.pem | 0 .../c.encryption-example.com/fullchain.pem | 0 .../live/c.encryption-example.com/privkey.pem | 0 .../sample-config/options-ssl-apache.conf | 0 .../renewal/a.encryption-example.com.conf | 0 .../renewal/b.encryption-example.com.conf | 0 .../renewal/c.encryption-example.com.conf | 0 .../certbot_tests/__init__.py | 0 .../certbot_tests/assertions.py | 0 .../certbot_tests/context.py | 0 .../certbot_tests/test_main.py | 0 .../certbot_integration_tests/conftest.py | 0 .../nginx_tests/__init__.py | 0 .../nginx_tests/context.py | 0 .../nginx_tests/nginx_config.py | 0 .../nginx_tests/test_main.py | 0 .../certbot_integration_tests/py.typed | 0 .../rfc2136_tests/__init__.py | 0 .../rfc2136_tests/context.py | 0 .../rfc2136_tests/test_main.py | 0 .../utils/__init__.py | 0 .../utils/acme_server.py | 0 .../utils/certbot_call.py | 2 +- .../utils/constants.py | 0 .../utils/dns_server.py | 0 .../certbot_integration_tests/utils/misc.py | 0 .../utils/pebble_artifacts.py | 0 .../utils/pebble_ocsp_server.py | 0 .../certbot_integration_tests/utils/proxy.py | 0 .../snap_integration_tests/__init__.py | 0 .../snap_integration_tests/conftest.py | 0 .../dns_tests/__init__.py | 0 .../dns_tests/test_main.py | 0 .../{ => src}/snap_integration_tests/py.typed | 0 certbot-compatibility-test/Dockerfile | 2 +- certbot-compatibility-test/MANIFEST.in | 8 +- certbot-compatibility-test/setup.py | 3 +- .../certbot_compatibility_test/__init__.py | 0 .../configurators/__init__.py | 0 .../configurators/apache/__init__.py | 0 .../configurators/apache/common.py | 0 .../configurators/common.py | 0 .../configurators/nginx/__init__.py | 0 .../configurators/nginx/common.py | 0 .../certbot_compatibility_test/errors.py | 0 .../certbot_compatibility_test/interfaces.py | 0 .../certbot_compatibility_test/test_driver.py | 0 .../testdata/apache.tar.gz | Bin .../testdata/empty_cert.pem | 0 .../testdata/nginx.tar.gz | Bin .../certbot_compatibility_test/util.py | 0 .../certbot_compatibility_test/validator.py | 0 certbot-dns-cloudflare/MANIFEST.in | 2 +- certbot-dns-cloudflare/setup.py | 3 +- .../certbot_dns_cloudflare/__init__.py | 0 .../_internal/__init__.py | 0 .../_internal/dns_cloudflare.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_cloudflare_test.py | 0 .../{ => src}/certbot_dns_cloudflare/py.typed | 0 certbot-dns-digitalocean/MANIFEST.in | 2 +- certbot-dns-digitalocean/setup.py | 3 +- .../certbot_dns_digitalocean/__init__.py | 0 .../_internal/__init__.py | 0 .../_internal/dns_digitalocean.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_digitalocean_test.py | 0 .../certbot_dns_digitalocean/py.typed | 0 certbot-dns-dnsimple/MANIFEST.in | 2 +- certbot-dns-dnsimple/setup.py | 3 +- .../certbot_dns_dnsimple/__init__.py | 0 .../_internal/__init__.py | 0 .../_internal/dns_dnsimple.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_dnsimple_test.py | 0 .../{ => src}/certbot_dns_dnsimple/py.typed | 0 certbot-dns-dnsmadeeasy/MANIFEST.in | 2 +- certbot-dns-dnsmadeeasy/setup.py | 3 +- .../certbot_dns_dnsmadeeasy/__init__.py | 0 .../_internal/__init__.py | 0 .../_internal/dns_dnsmadeeasy.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_dnsmadeeasy_test.py | 0 .../certbot_dns_dnsmadeeasy/py.typed | 0 certbot-dns-gehirn/MANIFEST.in | 2 +- certbot-dns-gehirn/setup.py | 3 +- .../{ => src}/certbot_dns_gehirn/__init__.py | 0 .../certbot_dns_gehirn/_internal/__init__.py | 0 .../_internal/dns_gehirn.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_gehirn_test.py | 0 .../{ => src}/certbot_dns_gehirn/py.typed | 0 certbot-dns-google/MANIFEST.in | 4 +- certbot-dns-google/setup.py | 3 +- .../{ => src}/certbot_dns_google/__init__.py | 0 .../certbot_dns_google/_internal/__init__.py | 0 .../_internal/dns_google.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_google_test.py | 0 .../_internal/tests/testdata/discovery.json | 0 .../{ => src}/certbot_dns_google/py.typed | 0 certbot-dns-linode/MANIFEST.in | 2 +- certbot-dns-linode/setup.py | 3 +- .../{ => src}/certbot_dns_linode/__init__.py | 0 .../certbot_dns_linode/_internal/__init__.py | 0 .../_internal/dns_linode.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_linode_test.py | 0 .../{ => src}/certbot_dns_linode/py.typed | 0 certbot-dns-luadns/MANIFEST.in | 2 +- certbot-dns-luadns/setup.py | 3 +- .../{ => src}/certbot_dns_luadns/__init__.py | 0 .../certbot_dns_luadns/_internal/__init__.py | 0 .../_internal/dns_luadns.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_luadns_test.py | 0 .../{ => src}/certbot_dns_luadns/py.typed | 0 certbot-dns-nsone/MANIFEST.in | 2 +- certbot-dns-nsone/setup.py | 3 +- .../{ => src}/certbot_dns_nsone/__init__.py | 0 .../certbot_dns_nsone/_internal/__init__.py | 0 .../certbot_dns_nsone/_internal/dns_nsone.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_nsone_test.py | 0 .../{ => src}/certbot_dns_nsone/py.typed | 0 certbot-dns-ovh/MANIFEST.in | 2 +- certbot-dns-ovh/setup.py | 3 +- .../{ => src}/certbot_dns_ovh/__init__.py | 0 .../certbot_dns_ovh/_internal/__init__.py | 0 .../certbot_dns_ovh/_internal/dns_ovh.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_ovh_test.py | 0 .../{ => src}/certbot_dns_ovh/py.typed | 0 certbot-dns-rfc2136/MANIFEST.in | 2 +- certbot-dns-rfc2136/setup.py | 3 +- .../{ => src}/certbot_dns_rfc2136/__init__.py | 0 .../certbot_dns_rfc2136/_internal/__init__.py | 0 .../_internal/dns_rfc2136.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_rfc2136_test.py | 0 .../{ => src}/certbot_dns_rfc2136/py.typed | 0 certbot-dns-route53/MANIFEST.in | 2 +- certbot-dns-route53/setup.py | 3 +- .../{ => src}/certbot_dns_route53/__init__.py | 0 .../certbot_dns_route53/_internal/__init__.py | 0 .../_internal/dns_route53.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_route53_test.py | 0 .../{ => src}/certbot_dns_route53/py.typed | 0 certbot-dns-sakuracloud/MANIFEST.in | 2 +- certbot-dns-sakuracloud/setup.py | 3 +- .../certbot_dns_sakuracloud/__init__.py | 0 .../_internal/__init__.py | 0 .../_internal/dns_sakuracloud.py | 0 .../_internal/tests/__init__.py | 0 .../_internal/tests/dns_sakuracloud_test.py | 0 .../certbot_dns_sakuracloud/py.typed | 0 certbot-nginx/MANIFEST.in | 6 +- certbot-nginx/setup.py | 3 +- .../{ => src}/certbot_nginx/__init__.py | 0 .../certbot_nginx/_internal/__init__.py | 0 .../certbot_nginx/_internal/configurator.py | 0 .../certbot_nginx/_internal/constants.py | 0 .../certbot_nginx/_internal/display_ops.py | 0 .../certbot_nginx/_internal/http_01.py | 0 .../certbot_nginx/_internal/nginxparser.py | 0 .../{ => src}/certbot_nginx/_internal/obj.py | 2 +- .../certbot_nginx/_internal/parser.py | 0 .../certbot_nginx/_internal/parser_obj.py | 0 .../certbot_nginx/_internal/tests/__init__.py | 0 .../_internal/tests/configurator_test.py | 0 .../_internal/tests/display_ops_test.py | 0 .../_internal/tests/http_01_test.py | 0 .../_internal/tests/nginxparser_test.py | 0 .../certbot_nginx/_internal/tests/obj_test.py | 0 .../_internal/tests/parser_obj_test.py | 0 .../_internal/tests/parser_test.py | 0 .../_internal/tests/test_util.py | 0 .../tests/testdata/etc_nginx/broken.conf | 0 .../testdata/etc_nginx/comment_in_file.conf | 0 .../tests/testdata/etc_nginx/edge_cases.conf | 0 .../tests/testdata/etc_nginx/foo.conf | 0 .../etc_nginx/invalid_unicode_comments.conf | 0 .../tests/testdata/etc_nginx/mime.types | 0 .../etc_nginx/minimalistic_comments.conf | 0 .../testdata/etc_nginx/multiline_quotes.conf | 0 .../testdata/etc_nginx/nginx-include.conf | 0 .../tests/testdata/etc_nginx/nginx.conf | 0 .../tests/testdata/etc_nginx/server.conf | 0 .../etc_nginx/sites-enabled/addr-80.com | 0 .../testdata/etc_nginx/sites-enabled/both.com | 0 .../testdata/etc_nginx/sites-enabled/default | 0 .../etc_nginx/sites-enabled/example.com | 0 .../etc_nginx/sites-enabled/example.net | 0 .../etc_nginx/sites-enabled/globalssl.com | 0 .../etc_nginx/sites-enabled/headers.com | 0 .../testdata/etc_nginx/sites-enabled/ipv6.com | 0 .../etc_nginx/sites-enabled/ipv6ssl.com | 0 .../etc_nginx/sites-enabled/migration.com | 0 .../etc_nginx/sites-enabled/sslon.com | 0 .../default_vhost/nginx/fastcgi_params | 0 .../default_vhost/nginx/koi-utf | 0 .../default_vhost/nginx/koi-win | 0 .../default_vhost/nginx/mime.types | 0 .../default_vhost/nginx/naxsi-ui.conf.1.4.1 | 0 .../default_vhost/nginx/naxsi.rules | 0 .../default_vhost/nginx/naxsi_core.rules | 0 .../default_vhost/nginx/nginx.conf | 0 .../default_vhost/nginx/proxy_params | 0 .../default_vhost/nginx/scgi_params | 0 .../nginx/sites-available/default | 0 .../default_vhost/nginx/sites-enabled/default | 0 .../default_vhost/nginx/uwsgi_params | 0 .../default_vhost/nginx/win-utf | 0 .../etc_nginx/valid_unicode_comments.conf | 0 .../tls_configs/options-ssl-nginx-old.conf | 0 .../options-ssl-nginx-tls12-only.conf | 0 ...ptions-ssl-nginx-tls13-session-tix-on.conf | 0 .../tls_configs/options-ssl-nginx.conf | 0 .../{ => src}/certbot_nginx/py.typed | 0 certbot/CHANGELOG.md | 2 +- certbot/MANIFEST.in | 6 +- certbot/docs/conf.py | 2 +- certbot/docs/contributing.rst | 8 +- certbot/docs/using.rst | 2 +- certbot/setup.py | 7 +- certbot/{ => src}/certbot/__init__.py | 0 .../{ => src}/certbot/_internal/__init__.py | 0 .../{ => src}/certbot/_internal/account.py | 0 .../certbot/_internal/auth_handler.py | 0 .../certbot/_internal/cert_manager.py | 0 .../certbot/_internal/cli/__init__.py | 0 .../certbot/_internal/cli/cli_constants.py | 0 .../certbot/_internal/cli/cli_utils.py | 0 .../certbot/_internal/cli/group_adder.py | 0 .../certbot/_internal/cli/helpful.py | 0 .../certbot/_internal/cli/paths_parser.py | 0 .../certbot/_internal/cli/plugins_parsing.py | 0 .../certbot/_internal/cli/subparsers.py | 0 .../certbot/_internal/cli/verb_help.py | 0 certbot/{ => src}/certbot/_internal/client.py | 0 .../{ => src}/certbot/_internal/constants.py | 0 .../certbot/_internal/display/__init__.py | 0 .../certbot/_internal/display/completer.py | 0 .../_internal/display/dummy_readline.py | 0 .../certbot/_internal/display/obj.py | 0 .../certbot/_internal/display/util.py | 0 certbot/{ => src}/certbot/_internal/eff.py | 0 .../certbot/_internal/error_handler.py | 0 certbot/{ => src}/certbot/_internal/hooks.py | 0 certbot/{ => src}/certbot/_internal/lock.py | 0 certbot/{ => src}/certbot/_internal/log.py | 0 certbot/{ => src}/certbot/_internal/main.py | 0 .../certbot/_internal/plugins/__init__.py | 0 .../certbot/_internal/plugins/disco.py | 0 .../certbot/_internal/plugins/manual.py | 0 .../certbot/_internal/plugins/null.py | 0 .../certbot/_internal/plugins/selection.py | 0 .../certbot/_internal/plugins/standalone.py | 0 .../certbot/_internal/plugins/webroot.py | 0 .../{ => src}/certbot/_internal/renewal.py | 0 .../certbot/_internal/snap_config.py | 0 .../{ => src}/certbot/_internal/storage.py | 0 .../certbot/_internal/tests/__init__.py | 0 .../certbot/_internal/tests/account_test.py | 0 .../_internal/tests/auth_handler_test.py | 0 .../_internal/tests/cert_manager_test.py | 0 .../certbot/_internal/tests/cli_test.py | 0 .../certbot/_internal/tests/client_test.py | 0 .../_internal/tests/compat/__init__.py | 0 .../_internal/tests/compat/filesystem_test.py | 0 .../_internal/tests/compat/misc_test.py | 0 .../certbot/_internal/tests/compat/os_test.py | 0 .../_internal/tests/configuration_test.py | 0 .../_internal/tests/crypto_util_test.py | 0 .../_internal/tests/display/__init__.py | 0 .../_internal/tests/display/completer_test.py | 0 .../tests/display/internal_util_test.py | 0 .../_internal/tests/display/obj_test.py | 0 .../_internal/tests/display/ops_test.py | 0 .../_internal/tests/display/util_test.py | 0 .../certbot/_internal/tests/eff_test.py | 0 .../_internal/tests/error_handler_test.py | 0 .../certbot/_internal/tests/errors_test.py | 0 .../certbot/_internal/tests/helpful_test.py | 0 .../certbot/_internal/tests/hook_test.py | 0 .../certbot/_internal/tests/lock_test.py | 0 .../certbot/_internal/tests/log_test.py | 0 .../certbot/_internal/tests/main_test.py | 0 .../certbot/_internal/tests/ocsp_test.py | 0 .../_internal/tests/plugins/__init__.py | 0 .../_internal/tests/plugins/common_test.py | 0 .../_internal/tests/plugins/disco_test.py | 0 .../tests/plugins/dns_common_test.py | 0 .../tests/plugins/enhancements_test.py | 0 .../_internal/tests/plugins/manual_test.py | 0 .../_internal/tests/plugins/null_test.py | 0 .../_internal/tests/plugins/selection_test.py | 0 .../tests/plugins/standalone_test.py | 0 .../_internal/tests/plugins/storage_test.py | 0 .../_internal/tests/plugins/util_test.py | 0 .../_internal/tests/plugins/webroot_test.py | 0 .../certbot/_internal/tests/renewal_test.py | 0 .../_internal/tests/renewupdater_test.py | 0 .../certbot/_internal/tests/reverter_test.py | 0 .../certbot/_internal/tests/storage_test.py | 0 .../certbot/_internal/tests/util_test.py | 0 .../{ => src}/certbot/_internal/updater.py | 0 certbot/{ => src}/certbot/achallenges.py | 0 certbot/{ => src}/certbot/compat/__init__.py | 0 certbot/{ => src}/certbot/compat/_path.py | 0 .../{ => src}/certbot/compat/filesystem.py | 0 certbot/{ => src}/certbot/compat/misc.py | 0 certbot/{ => src}/certbot/compat/os.py | 0 certbot/{ => src}/certbot/configuration.py | 0 certbot/{ => src}/certbot/crypto_util.py | 0 certbot/{ => src}/certbot/display/__init__.py | 0 certbot/{ => src}/certbot/display/ops.py | 0 certbot/{ => src}/certbot/display/util.py | 0 certbot/{ => src}/certbot/errors.py | 0 certbot/{ => src}/certbot/interfaces.py | 0 certbot/{ => src}/certbot/main.py | 0 certbot/{ => src}/certbot/ocsp.py | 0 certbot/{ => src}/certbot/plugins/__init__.py | 0 certbot/{ => src}/certbot/plugins/common.py | 0 .../{ => src}/certbot/plugins/dns_common.py | 0 .../certbot/plugins/dns_common_lexicon.py | 0 .../certbot/plugins/dns_test_common.py | 0 .../plugins/dns_test_common_lexicon.py | 0 .../{ => src}/certbot/plugins/enhancements.py | 0 certbot/{ => src}/certbot/plugins/storage.py | 0 certbot/{ => src}/certbot/plugins/util.py | 0 certbot/{ => src}/certbot/py.typed | 0 certbot/{ => src}/certbot/reverter.py | 0 certbot/{ => src}/certbot/ssl-dhparams.pem | 0 certbot/{ => src}/certbot/tests/__init__.py | 0 certbot/{ => src}/certbot/tests/acme_util.py | 0 .../{ => src}/certbot/tests/testdata/README | 0 .../certbot/tests/testdata/cert-5sans_512.pem | 0 .../tests/testdata/cert-nosans_nistp256.pem | 0 .../certbot/tests/testdata/cert-san_512.pem | 0 .../certbot/tests/testdata/cert_2048.pem | 0 .../certbot/tests/testdata/cert_512.pem | 0 .../certbot/tests/testdata/cert_512_bad.pem | 0 .../tests/testdata/cert_fullchain_2048.pem | 0 .../tests/testdata/cert_intermediate_1.pem | 0 .../tests/testdata/cert_intermediate_2.pem | 0 .../certbot/tests/testdata/cert_leaf.pem | 0 .../{ => src}/certbot/tests/testdata/cli.ini | 0 .../certbot/tests/testdata/csr-6sans_512.conf | 0 .../certbot/tests/testdata/csr-6sans_512.pem | 0 .../tests/testdata/csr-nonames_512.pem | 0 .../tests/testdata/csr-nosans_512.conf | 0 .../certbot/tests/testdata/csr-nosans_512.pem | 0 .../tests/testdata/csr-nosans_nistp256.pem | 0 .../certbot/tests/testdata/csr-san_512.pem | 0 .../certbot/tests/testdata/csr_512.der | Bin .../certbot/tests/testdata/csr_512.pem | 0 .../tests/testdata/ec_prime256v1_key.pem | 0 .../tests/testdata/ec_secp384r1_key.pem | 0 .../tests/testdata/ec_secp521r1_key.pem | 0 .../certbot/tests/testdata/nistp256_key.pem | 0 .../tests/testdata/ocsp_certificate.pem | 0 .../testdata/ocsp_issuer_certificate.pem | 0 .../testdata/ocsp_responder_certificate.pem | 0 .../certbot/tests/testdata/os-release | 0 .../certbot/tests/testdata/rsa2048_key.pem | 0 .../certbot/tests/testdata/rsa512_key.pem | 0 .../testdata/sample-archive-ec/cert1.pem | 0 .../testdata/sample-archive-ec/chain1.pem | 0 .../testdata/sample-archive-ec/fullchain1.pem | 0 .../testdata/sample-archive-ec/privkey1.pem | 0 .../tests/testdata/sample-archive/cert1.pem | 0 .../tests/testdata/sample-archive/chain1.pem | 0 .../testdata/sample-archive/fullchain1.pem | 0 .../testdata/sample-archive/privkey1.pem | 0 .../testdata/sample-renewal-ancient.conf | 0 .../sample-renewal-deprecated-option.conf | 0 .../tests/testdata/sample-renewal-ec.conf | 0 .../tests/testdata/sample-renewal.conf | 0 .../tests/testdata/webrootconftest.ini | 0 certbot/{ => src}/certbot/tests/util.py | 0 certbot/{ => src}/certbot/util.py | 0 letstest/scripts/version.py | 1 + linter_plugin.py | 6 +- snap/snapcraft.yaml | 4 +- tools/_release.sh | 2 +- tools/oldest_constraints.txt | 188 +++++++++--------- tools/pinning/oldest/pyproject.toml | 1 - tools/pip_install.py | 2 +- tools/requirements.txt | 54 ++--- tox.ini | 32 +-- 723 files changed, 234 insertions(+), 207 deletions(-) rename acme/{ => src}/acme/__init__.py (100%) rename acme/{ => src}/acme/_internal/__init__.py (100%) rename acme/{ => src}/acme/_internal/tests/__init__.py (100%) rename acme/{ => src}/acme/_internal/tests/challenges_test.py (100%) rename acme/{ => src}/acme/_internal/tests/client_test.py (100%) rename acme/{ => src}/acme/_internal/tests/crypto_util_test.py (100%) rename acme/{ => src}/acme/_internal/tests/errors_test.py (100%) rename acme/{ => src}/acme/_internal/tests/fields_test.py (100%) rename acme/{ => src}/acme/_internal/tests/jose_test.py (100%) rename acme/{ => src}/acme/_internal/tests/jws_test.py (100%) rename acme/{ => src}/acme/_internal/tests/messages_test.py (100%) rename acme/{ => src}/acme/_internal/tests/standalone_test.py (100%) rename acme/{ => src}/acme/_internal/tests/test_util.py (100%) rename acme/{ => src}/acme/_internal/tests/testdata/README (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert-100sans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert-idnsans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert-ipsans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert-ipv6sans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert-nocn.der (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert-san.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert.der (100%) rename acme/{ => src}/acme/_internal/tests/testdata/cert.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/critical-san.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-100sans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-6sans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-idnsans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-ipsans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-ipv6sans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-mixed.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-nosans.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr-san.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr.der (100%) rename acme/{ => src}/acme/_internal/tests/testdata/csr.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/dsa512_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/ec_secp384r1_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa1024_cert.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa1024_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa2048_cert.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa2048_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa256_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa4096_cert.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa4096_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/testdata/rsa512_key.pem (100%) rename acme/{ => src}/acme/_internal/tests/util_test.py (100%) rename acme/{ => src}/acme/challenges.py (100%) rename acme/{ => src}/acme/client.py (100%) rename acme/{ => src}/acme/crypto_util.py (100%) rename acme/{ => src}/acme/errors.py (100%) rename acme/{ => src}/acme/fields.py (100%) rename acme/{ => src}/acme/jws.py (100%) rename acme/{ => src}/acme/messages.py (100%) rename acme/{ => src}/acme/py.typed (100%) rename acme/{ => src}/acme/standalone.py (100%) rename acme/{ => src}/acme/util.py (100%) rename certbot-apache/{ => src}/certbot_apache/__init__.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/__init__.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/apache_util.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/apacheparser.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/assertions.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/augeas_lens/README (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/augeas_lens/httpd.aug (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/augeasparser.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/configurator.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/constants.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/display_ops.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/dualparser.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/entrypoint.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/http_01.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/interfaces.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/obj.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_alpine.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_arch.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_centos.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_darwin.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_debian.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_fedora.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_gentoo.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_suse.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/override_void.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/parser.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/parsernode_util.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/__init__.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/augeasnode_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/autohsts_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/centos_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/complex_parsing_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/configurator_reverter_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/configurator_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/debian_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/display_ops_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/dualnode_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/entrypoint_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/fedora_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/gentoo_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/http_01_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/obj_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/parser_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/parsernode_configurator_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/parsernode_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/parsernode_util_test.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2 (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tests/util.py (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf (100%) rename certbot-apache/{ => src}/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf (100%) rename certbot-apache/{ => src}/certbot_apache/py.typed (100%) rename certbot-ci/{ => src}/certbot_integration_tests/.coveragerc (100%) rename certbot-ci/{ => src}/certbot_integration_tests/__init__.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/bind-config/conf/named.conf (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/bind-config/rfc2136-credentials-default.ini.tpl (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/bind-config/zones/db.example.com (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/bind-config/zones/db.sub.example.com (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/bind-config/zones/rpz.mock-recursion (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/cert.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/hook.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/key.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/cert1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/chain1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/fullchain1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/privkey1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/cert1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/chain1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/fullchain1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/privkey1.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/README (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/cert.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/chain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/fullchain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/privkey.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/csr/0000_csr-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/csr/0001_csr-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/csr/0002_csr-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/csr/0003_csr-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/keys/0000_key-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/keys/0001_key-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/keys/0002_key-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/keys/0003_key-certbot.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/README (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/cert.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/chain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/fullchain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/privkey.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/README (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/cert.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/chain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/fullchain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/privkey.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/README (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/cert.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/chain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/fullchain.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/privkey.pem (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/options-ssl-apache.conf (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/renewal/a.encryption-example.com.conf (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/renewal/b.encryption-example.com.conf (100%) rename certbot-ci/{ => src}/certbot_integration_tests/assets/sample-config/renewal/c.encryption-example.com.conf (100%) rename certbot-ci/{ => src}/certbot_integration_tests/certbot_tests/__init__.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/certbot_tests/assertions.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/certbot_tests/context.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/certbot_tests/test_main.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/conftest.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/nginx_tests/__init__.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/nginx_tests/context.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/nginx_tests/nginx_config.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/nginx_tests/test_main.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/py.typed (100%) rename certbot-ci/{ => src}/certbot_integration_tests/rfc2136_tests/__init__.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/rfc2136_tests/context.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/rfc2136_tests/test_main.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/__init__.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/acme_server.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/certbot_call.py (98%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/constants.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/dns_server.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/misc.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/pebble_artifacts.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/pebble_ocsp_server.py (100%) rename certbot-ci/{ => src}/certbot_integration_tests/utils/proxy.py (100%) rename certbot-ci/{ => src}/snap_integration_tests/__init__.py (100%) rename certbot-ci/{ => src}/snap_integration_tests/conftest.py (100%) rename certbot-ci/{ => src}/snap_integration_tests/dns_tests/__init__.py (100%) rename certbot-ci/{ => src}/snap_integration_tests/dns_tests/test_main.py (100%) rename certbot-ci/{ => src}/snap_integration_tests/py.typed (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/__init__.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/configurators/__init__.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/configurators/apache/__init__.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/configurators/apache/common.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/configurators/common.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/configurators/nginx/__init__.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/configurators/nginx/common.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/errors.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/interfaces.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/test_driver.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/testdata/apache.tar.gz (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/testdata/empty_cert.pem (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/testdata/nginx.tar.gz (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/util.py (100%) rename certbot-compatibility-test/{ => src}/certbot_compatibility_test/validator.py (100%) rename certbot-dns-cloudflare/{ => src}/certbot_dns_cloudflare/__init__.py (100%) rename certbot-dns-cloudflare/{ => src}/certbot_dns_cloudflare/_internal/__init__.py (100%) rename certbot-dns-cloudflare/{ => src}/certbot_dns_cloudflare/_internal/dns_cloudflare.py (100%) rename certbot-dns-cloudflare/{ => src}/certbot_dns_cloudflare/_internal/tests/__init__.py (100%) rename certbot-dns-cloudflare/{ => src}/certbot_dns_cloudflare/_internal/tests/dns_cloudflare_test.py (100%) rename certbot-dns-cloudflare/{ => src}/certbot_dns_cloudflare/py.typed (100%) rename certbot-dns-digitalocean/{ => src}/certbot_dns_digitalocean/__init__.py (100%) rename certbot-dns-digitalocean/{ => src}/certbot_dns_digitalocean/_internal/__init__.py (100%) rename certbot-dns-digitalocean/{ => src}/certbot_dns_digitalocean/_internal/dns_digitalocean.py (100%) rename certbot-dns-digitalocean/{ => src}/certbot_dns_digitalocean/_internal/tests/__init__.py (100%) rename certbot-dns-digitalocean/{ => src}/certbot_dns_digitalocean/_internal/tests/dns_digitalocean_test.py (100%) rename certbot-dns-digitalocean/{ => src}/certbot_dns_digitalocean/py.typed (100%) rename certbot-dns-dnsimple/{ => src}/certbot_dns_dnsimple/__init__.py (100%) rename certbot-dns-dnsimple/{ => src}/certbot_dns_dnsimple/_internal/__init__.py (100%) rename certbot-dns-dnsimple/{ => src}/certbot_dns_dnsimple/_internal/dns_dnsimple.py (100%) rename certbot-dns-dnsimple/{ => src}/certbot_dns_dnsimple/_internal/tests/__init__.py (100%) rename certbot-dns-dnsimple/{ => src}/certbot_dns_dnsimple/_internal/tests/dns_dnsimple_test.py (100%) rename certbot-dns-dnsimple/{ => src}/certbot_dns_dnsimple/py.typed (100%) rename certbot-dns-dnsmadeeasy/{ => src}/certbot_dns_dnsmadeeasy/__init__.py (100%) rename certbot-dns-dnsmadeeasy/{ => src}/certbot_dns_dnsmadeeasy/_internal/__init__.py (100%) rename certbot-dns-dnsmadeeasy/{ => src}/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py (100%) rename certbot-dns-dnsmadeeasy/{ => src}/certbot_dns_dnsmadeeasy/_internal/tests/__init__.py (100%) rename certbot-dns-dnsmadeeasy/{ => src}/certbot_dns_dnsmadeeasy/_internal/tests/dns_dnsmadeeasy_test.py (100%) rename certbot-dns-dnsmadeeasy/{ => src}/certbot_dns_dnsmadeeasy/py.typed (100%) rename certbot-dns-gehirn/{ => src}/certbot_dns_gehirn/__init__.py (100%) rename certbot-dns-gehirn/{ => src}/certbot_dns_gehirn/_internal/__init__.py (100%) rename certbot-dns-gehirn/{ => src}/certbot_dns_gehirn/_internal/dns_gehirn.py (100%) rename certbot-dns-gehirn/{ => src}/certbot_dns_gehirn/_internal/tests/__init__.py (100%) rename certbot-dns-gehirn/{ => src}/certbot_dns_gehirn/_internal/tests/dns_gehirn_test.py (100%) rename certbot-dns-gehirn/{ => src}/certbot_dns_gehirn/py.typed (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/__init__.py (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/_internal/__init__.py (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/_internal/dns_google.py (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/_internal/tests/__init__.py (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/_internal/tests/dns_google_test.py (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/_internal/tests/testdata/discovery.json (100%) rename certbot-dns-google/{ => src}/certbot_dns_google/py.typed (100%) rename certbot-dns-linode/{ => src}/certbot_dns_linode/__init__.py (100%) rename certbot-dns-linode/{ => src}/certbot_dns_linode/_internal/__init__.py (100%) rename certbot-dns-linode/{ => src}/certbot_dns_linode/_internal/dns_linode.py (100%) rename certbot-dns-linode/{ => src}/certbot_dns_linode/_internal/tests/__init__.py (100%) rename certbot-dns-linode/{ => src}/certbot_dns_linode/_internal/tests/dns_linode_test.py (100%) rename certbot-dns-linode/{ => src}/certbot_dns_linode/py.typed (100%) rename certbot-dns-luadns/{ => src}/certbot_dns_luadns/__init__.py (100%) rename certbot-dns-luadns/{ => src}/certbot_dns_luadns/_internal/__init__.py (100%) rename certbot-dns-luadns/{ => src}/certbot_dns_luadns/_internal/dns_luadns.py (100%) rename certbot-dns-luadns/{ => src}/certbot_dns_luadns/_internal/tests/__init__.py (100%) rename certbot-dns-luadns/{ => src}/certbot_dns_luadns/_internal/tests/dns_luadns_test.py (100%) rename certbot-dns-luadns/{ => src}/certbot_dns_luadns/py.typed (100%) rename certbot-dns-nsone/{ => src}/certbot_dns_nsone/__init__.py (100%) rename certbot-dns-nsone/{ => src}/certbot_dns_nsone/_internal/__init__.py (100%) rename certbot-dns-nsone/{ => src}/certbot_dns_nsone/_internal/dns_nsone.py (100%) rename certbot-dns-nsone/{ => src}/certbot_dns_nsone/_internal/tests/__init__.py (100%) rename certbot-dns-nsone/{ => src}/certbot_dns_nsone/_internal/tests/dns_nsone_test.py (100%) rename certbot-dns-nsone/{ => src}/certbot_dns_nsone/py.typed (100%) rename certbot-dns-ovh/{ => src}/certbot_dns_ovh/__init__.py (100%) rename certbot-dns-ovh/{ => src}/certbot_dns_ovh/_internal/__init__.py (100%) rename certbot-dns-ovh/{ => src}/certbot_dns_ovh/_internal/dns_ovh.py (100%) rename certbot-dns-ovh/{ => src}/certbot_dns_ovh/_internal/tests/__init__.py (100%) rename certbot-dns-ovh/{ => src}/certbot_dns_ovh/_internal/tests/dns_ovh_test.py (100%) rename certbot-dns-ovh/{ => src}/certbot_dns_ovh/py.typed (100%) rename certbot-dns-rfc2136/{ => src}/certbot_dns_rfc2136/__init__.py (100%) rename certbot-dns-rfc2136/{ => src}/certbot_dns_rfc2136/_internal/__init__.py (100%) rename certbot-dns-rfc2136/{ => src}/certbot_dns_rfc2136/_internal/dns_rfc2136.py (100%) rename certbot-dns-rfc2136/{ => src}/certbot_dns_rfc2136/_internal/tests/__init__.py (100%) rename certbot-dns-rfc2136/{ => src}/certbot_dns_rfc2136/_internal/tests/dns_rfc2136_test.py (100%) rename certbot-dns-rfc2136/{ => src}/certbot_dns_rfc2136/py.typed (100%) rename certbot-dns-route53/{ => src}/certbot_dns_route53/__init__.py (100%) rename certbot-dns-route53/{ => src}/certbot_dns_route53/_internal/__init__.py (100%) rename certbot-dns-route53/{ => src}/certbot_dns_route53/_internal/dns_route53.py (100%) rename certbot-dns-route53/{ => src}/certbot_dns_route53/_internal/tests/__init__.py (100%) rename certbot-dns-route53/{ => src}/certbot_dns_route53/_internal/tests/dns_route53_test.py (100%) rename certbot-dns-route53/{ => src}/certbot_dns_route53/py.typed (100%) rename certbot-dns-sakuracloud/{ => src}/certbot_dns_sakuracloud/__init__.py (100%) rename certbot-dns-sakuracloud/{ => src}/certbot_dns_sakuracloud/_internal/__init__.py (100%) rename certbot-dns-sakuracloud/{ => src}/certbot_dns_sakuracloud/_internal/dns_sakuracloud.py (100%) rename certbot-dns-sakuracloud/{ => src}/certbot_dns_sakuracloud/_internal/tests/__init__.py (100%) rename certbot-dns-sakuracloud/{ => src}/certbot_dns_sakuracloud/_internal/tests/dns_sakuracloud_test.py (100%) rename certbot-dns-sakuracloud/{ => src}/certbot_dns_sakuracloud/py.typed (100%) rename certbot-nginx/{ => src}/certbot_nginx/__init__.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/__init__.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/configurator.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/constants.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/display_ops.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/http_01.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/nginxparser.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/obj.py (99%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/parser.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/parser_obj.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/__init__.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/configurator_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/display_ops_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/http_01_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/nginxparser_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/obj_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/parser_obj_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/parser_test.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/test_util.py (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/broken.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/comment_in_file.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/edge_cases.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/foo.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/invalid_unicode_comments.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/mime.types (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/minimalistic_comments.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/multiline_quotes.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx-include.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/server.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/addr-80.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/both.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/default (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.net (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/globalssl.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/headers.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/migration.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/sslon.com (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tests/testdata/etc_nginx/valid_unicode_comments.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tls_configs/options-ssl-nginx-old.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls12-only.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls13-session-tix-on.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf (100%) rename certbot-nginx/{ => src}/certbot_nginx/py.typed (100%) rename certbot/{ => src}/certbot/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/account.py (100%) rename certbot/{ => src}/certbot/_internal/auth_handler.py (100%) rename certbot/{ => src}/certbot/_internal/cert_manager.py (100%) rename certbot/{ => src}/certbot/_internal/cli/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/cli/cli_constants.py (100%) rename certbot/{ => src}/certbot/_internal/cli/cli_utils.py (100%) rename certbot/{ => src}/certbot/_internal/cli/group_adder.py (100%) rename certbot/{ => src}/certbot/_internal/cli/helpful.py (100%) rename certbot/{ => src}/certbot/_internal/cli/paths_parser.py (100%) rename certbot/{ => src}/certbot/_internal/cli/plugins_parsing.py (100%) rename certbot/{ => src}/certbot/_internal/cli/subparsers.py (100%) rename certbot/{ => src}/certbot/_internal/cli/verb_help.py (100%) rename certbot/{ => src}/certbot/_internal/client.py (100%) rename certbot/{ => src}/certbot/_internal/constants.py (100%) rename certbot/{ => src}/certbot/_internal/display/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/display/completer.py (100%) rename certbot/{ => src}/certbot/_internal/display/dummy_readline.py (100%) rename certbot/{ => src}/certbot/_internal/display/obj.py (100%) rename certbot/{ => src}/certbot/_internal/display/util.py (100%) rename certbot/{ => src}/certbot/_internal/eff.py (100%) rename certbot/{ => src}/certbot/_internal/error_handler.py (100%) rename certbot/{ => src}/certbot/_internal/hooks.py (100%) rename certbot/{ => src}/certbot/_internal/lock.py (100%) rename certbot/{ => src}/certbot/_internal/log.py (100%) rename certbot/{ => src}/certbot/_internal/main.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/disco.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/manual.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/null.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/selection.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/standalone.py (100%) rename certbot/{ => src}/certbot/_internal/plugins/webroot.py (100%) rename certbot/{ => src}/certbot/_internal/renewal.py (100%) rename certbot/{ => src}/certbot/_internal/snap_config.py (100%) rename certbot/{ => src}/certbot/_internal/storage.py (100%) rename certbot/{ => src}/certbot/_internal/tests/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/tests/account_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/auth_handler_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/cert_manager_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/cli_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/client_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/compat/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/tests/compat/filesystem_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/compat/misc_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/compat/os_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/configuration_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/crypto_util_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/display/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/tests/display/completer_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/display/internal_util_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/display/obj_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/display/ops_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/display/util_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/eff_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/error_handler_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/errors_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/helpful_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/hook_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/lock_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/log_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/main_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/ocsp_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/__init__.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/common_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/disco_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/dns_common_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/enhancements_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/manual_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/null_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/selection_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/standalone_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/storage_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/util_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/plugins/webroot_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/renewal_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/renewupdater_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/reverter_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/storage_test.py (100%) rename certbot/{ => src}/certbot/_internal/tests/util_test.py (100%) rename certbot/{ => src}/certbot/_internal/updater.py (100%) rename certbot/{ => src}/certbot/achallenges.py (100%) rename certbot/{ => src}/certbot/compat/__init__.py (100%) rename certbot/{ => src}/certbot/compat/_path.py (100%) rename certbot/{ => src}/certbot/compat/filesystem.py (100%) rename certbot/{ => src}/certbot/compat/misc.py (100%) rename certbot/{ => src}/certbot/compat/os.py (100%) rename certbot/{ => src}/certbot/configuration.py (100%) rename certbot/{ => src}/certbot/crypto_util.py (100%) rename certbot/{ => src}/certbot/display/__init__.py (100%) rename certbot/{ => src}/certbot/display/ops.py (100%) rename certbot/{ => src}/certbot/display/util.py (100%) rename certbot/{ => src}/certbot/errors.py (100%) rename certbot/{ => src}/certbot/interfaces.py (100%) rename certbot/{ => src}/certbot/main.py (100%) rename certbot/{ => src}/certbot/ocsp.py (100%) rename certbot/{ => src}/certbot/plugins/__init__.py (100%) rename certbot/{ => src}/certbot/plugins/common.py (100%) rename certbot/{ => src}/certbot/plugins/dns_common.py (100%) rename certbot/{ => src}/certbot/plugins/dns_common_lexicon.py (100%) rename certbot/{ => src}/certbot/plugins/dns_test_common.py (100%) rename certbot/{ => src}/certbot/plugins/dns_test_common_lexicon.py (100%) rename certbot/{ => src}/certbot/plugins/enhancements.py (100%) rename certbot/{ => src}/certbot/plugins/storage.py (100%) rename certbot/{ => src}/certbot/plugins/util.py (100%) rename certbot/{ => src}/certbot/py.typed (100%) rename certbot/{ => src}/certbot/reverter.py (100%) rename certbot/{ => src}/certbot/ssl-dhparams.pem (100%) rename certbot/{ => src}/certbot/tests/__init__.py (100%) rename certbot/{ => src}/certbot/tests/acme_util.py (100%) rename certbot/{ => src}/certbot/tests/testdata/README (100%) rename certbot/{ => src}/certbot/tests/testdata/cert-5sans_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert-nosans_nistp256.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert-san_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_2048.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_512_bad.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_fullchain_2048.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_intermediate_1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_intermediate_2.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cert_leaf.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/cli.ini (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-6sans_512.conf (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-6sans_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-nonames_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-nosans_512.conf (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-nosans_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-nosans_nistp256.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/csr-san_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/csr_512.der (100%) rename certbot/{ => src}/certbot/tests/testdata/csr_512.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/ec_prime256v1_key.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/ec_secp384r1_key.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/ec_secp521r1_key.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/nistp256_key.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/ocsp_certificate.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/ocsp_issuer_certificate.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/ocsp_responder_certificate.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/os-release (100%) rename certbot/{ => src}/certbot/tests/testdata/rsa2048_key.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/rsa512_key.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive-ec/cert1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive-ec/chain1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive-ec/fullchain1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive-ec/privkey1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive/cert1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive/chain1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive/fullchain1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-archive/privkey1.pem (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-renewal-ancient.conf (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-renewal-deprecated-option.conf (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-renewal-ec.conf (100%) rename certbot/{ => src}/certbot/tests/testdata/sample-renewal.conf (100%) rename certbot/{ => src}/certbot/tests/testdata/webrootconftest.ini (100%) rename certbot/{ => src}/certbot/tests/util.py (100%) rename certbot/{ => src}/certbot/util.py (100%) diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml index 03a88f2a9..be2979f57 100644 --- a/.azure-pipelines/templates/jobs/packaging-jobs.yml +++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml @@ -155,5 +155,5 @@ jobs: displayName: Prepare Certbot-CI - script: | set -e - sudo -E venv/bin/pytest certbot-ci/snap_integration_tests/dns_tests --allow-persistent-changes --snap-folder $(Build.SourcesDirectory)/snap --snap-arch amd64 + sudo -E venv/bin/pytest certbot-ci/src/snap_integration_tests/dns_tests --allow-persistent-changes --snap-folder $(Build.SourcesDirectory)/snap --snap-arch amd64 displayName: Test DNS plugins snaps diff --git a/.isort.cfg b/.isort.cfg index ce2d6c6de..821e38573 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -4,4 +4,4 @@ force_sort_within_sections=True force_single_line=True order_by_type=False line_length=400 -src_paths=acme/acme,acme/tests,certbot*/certbot*,certbot*/tests +src_paths=acme/src,acme/tests,certbot*/tests,certbot/src,certbot*/src/certbot* diff --git a/acme/MANIFEST.in b/acme/MANIFEST.in index b3badd473..601007bfe 100644 --- a/acme/MANIFEST.in +++ b/acme/MANIFEST.in @@ -3,7 +3,7 @@ include README.rst include pytest.ini recursive-include docs * recursive-include examples * -recursive-include acme/_internal/tests/testdata * -include acme/py.typed +recursive-include src/acme/_internal/tests/testdata * +include src/acme/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/acme/setup.py b/acme/setup.py index ce2b7e9fe..214d1ba6a 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -49,7 +49,8 @@ setup( 'Topic :: Security', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/acme/acme/__init__.py b/acme/src/acme/__init__.py similarity index 100% rename from acme/acme/__init__.py rename to acme/src/acme/__init__.py diff --git a/acme/acme/_internal/__init__.py b/acme/src/acme/_internal/__init__.py similarity index 100% rename from acme/acme/_internal/__init__.py rename to acme/src/acme/_internal/__init__.py diff --git a/acme/acme/_internal/tests/__init__.py b/acme/src/acme/_internal/tests/__init__.py similarity index 100% rename from acme/acme/_internal/tests/__init__.py rename to acme/src/acme/_internal/tests/__init__.py diff --git a/acme/acme/_internal/tests/challenges_test.py b/acme/src/acme/_internal/tests/challenges_test.py similarity index 100% rename from acme/acme/_internal/tests/challenges_test.py rename to acme/src/acme/_internal/tests/challenges_test.py diff --git a/acme/acme/_internal/tests/client_test.py b/acme/src/acme/_internal/tests/client_test.py similarity index 100% rename from acme/acme/_internal/tests/client_test.py rename to acme/src/acme/_internal/tests/client_test.py diff --git a/acme/acme/_internal/tests/crypto_util_test.py b/acme/src/acme/_internal/tests/crypto_util_test.py similarity index 100% rename from acme/acme/_internal/tests/crypto_util_test.py rename to acme/src/acme/_internal/tests/crypto_util_test.py diff --git a/acme/acme/_internal/tests/errors_test.py b/acme/src/acme/_internal/tests/errors_test.py similarity index 100% rename from acme/acme/_internal/tests/errors_test.py rename to acme/src/acme/_internal/tests/errors_test.py diff --git a/acme/acme/_internal/tests/fields_test.py b/acme/src/acme/_internal/tests/fields_test.py similarity index 100% rename from acme/acme/_internal/tests/fields_test.py rename to acme/src/acme/_internal/tests/fields_test.py diff --git a/acme/acme/_internal/tests/jose_test.py b/acme/src/acme/_internal/tests/jose_test.py similarity index 100% rename from acme/acme/_internal/tests/jose_test.py rename to acme/src/acme/_internal/tests/jose_test.py diff --git a/acme/acme/_internal/tests/jws_test.py b/acme/src/acme/_internal/tests/jws_test.py similarity index 100% rename from acme/acme/_internal/tests/jws_test.py rename to acme/src/acme/_internal/tests/jws_test.py diff --git a/acme/acme/_internal/tests/messages_test.py b/acme/src/acme/_internal/tests/messages_test.py similarity index 100% rename from acme/acme/_internal/tests/messages_test.py rename to acme/src/acme/_internal/tests/messages_test.py diff --git a/acme/acme/_internal/tests/standalone_test.py b/acme/src/acme/_internal/tests/standalone_test.py similarity index 100% rename from acme/acme/_internal/tests/standalone_test.py rename to acme/src/acme/_internal/tests/standalone_test.py diff --git a/acme/acme/_internal/tests/test_util.py b/acme/src/acme/_internal/tests/test_util.py similarity index 100% rename from acme/acme/_internal/tests/test_util.py rename to acme/src/acme/_internal/tests/test_util.py diff --git a/acme/acme/_internal/tests/testdata/README b/acme/src/acme/_internal/tests/testdata/README similarity index 100% rename from acme/acme/_internal/tests/testdata/README rename to acme/src/acme/_internal/tests/testdata/README diff --git a/acme/acme/_internal/tests/testdata/cert-100sans.pem b/acme/src/acme/_internal/tests/testdata/cert-100sans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/cert-100sans.pem rename to acme/src/acme/_internal/tests/testdata/cert-100sans.pem diff --git a/acme/acme/_internal/tests/testdata/cert-idnsans.pem b/acme/src/acme/_internal/tests/testdata/cert-idnsans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/cert-idnsans.pem rename to acme/src/acme/_internal/tests/testdata/cert-idnsans.pem diff --git a/acme/acme/_internal/tests/testdata/cert-ipsans.pem b/acme/src/acme/_internal/tests/testdata/cert-ipsans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/cert-ipsans.pem rename to acme/src/acme/_internal/tests/testdata/cert-ipsans.pem diff --git a/acme/acme/_internal/tests/testdata/cert-ipv6sans.pem b/acme/src/acme/_internal/tests/testdata/cert-ipv6sans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/cert-ipv6sans.pem rename to acme/src/acme/_internal/tests/testdata/cert-ipv6sans.pem diff --git a/acme/acme/_internal/tests/testdata/cert-nocn.der b/acme/src/acme/_internal/tests/testdata/cert-nocn.der similarity index 100% rename from acme/acme/_internal/tests/testdata/cert-nocn.der rename to acme/src/acme/_internal/tests/testdata/cert-nocn.der diff --git a/acme/acme/_internal/tests/testdata/cert-san.pem b/acme/src/acme/_internal/tests/testdata/cert-san.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/cert-san.pem rename to acme/src/acme/_internal/tests/testdata/cert-san.pem diff --git a/acme/acme/_internal/tests/testdata/cert.der b/acme/src/acme/_internal/tests/testdata/cert.der similarity index 100% rename from acme/acme/_internal/tests/testdata/cert.der rename to acme/src/acme/_internal/tests/testdata/cert.der diff --git a/acme/acme/_internal/tests/testdata/cert.pem b/acme/src/acme/_internal/tests/testdata/cert.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/cert.pem rename to acme/src/acme/_internal/tests/testdata/cert.pem diff --git a/acme/acme/_internal/tests/testdata/critical-san.pem b/acme/src/acme/_internal/tests/testdata/critical-san.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/critical-san.pem rename to acme/src/acme/_internal/tests/testdata/critical-san.pem diff --git a/acme/acme/_internal/tests/testdata/csr-100sans.pem b/acme/src/acme/_internal/tests/testdata/csr-100sans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-100sans.pem rename to acme/src/acme/_internal/tests/testdata/csr-100sans.pem diff --git a/acme/acme/_internal/tests/testdata/csr-6sans.pem b/acme/src/acme/_internal/tests/testdata/csr-6sans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-6sans.pem rename to acme/src/acme/_internal/tests/testdata/csr-6sans.pem diff --git a/acme/acme/_internal/tests/testdata/csr-idnsans.pem b/acme/src/acme/_internal/tests/testdata/csr-idnsans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-idnsans.pem rename to acme/src/acme/_internal/tests/testdata/csr-idnsans.pem diff --git a/acme/acme/_internal/tests/testdata/csr-ipsans.pem b/acme/src/acme/_internal/tests/testdata/csr-ipsans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-ipsans.pem rename to acme/src/acme/_internal/tests/testdata/csr-ipsans.pem diff --git a/acme/acme/_internal/tests/testdata/csr-ipv6sans.pem b/acme/src/acme/_internal/tests/testdata/csr-ipv6sans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-ipv6sans.pem rename to acme/src/acme/_internal/tests/testdata/csr-ipv6sans.pem diff --git a/acme/acme/_internal/tests/testdata/csr-mixed.pem b/acme/src/acme/_internal/tests/testdata/csr-mixed.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-mixed.pem rename to acme/src/acme/_internal/tests/testdata/csr-mixed.pem diff --git a/acme/acme/_internal/tests/testdata/csr-nosans.pem b/acme/src/acme/_internal/tests/testdata/csr-nosans.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-nosans.pem rename to acme/src/acme/_internal/tests/testdata/csr-nosans.pem diff --git a/acme/acme/_internal/tests/testdata/csr-san.pem b/acme/src/acme/_internal/tests/testdata/csr-san.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr-san.pem rename to acme/src/acme/_internal/tests/testdata/csr-san.pem diff --git a/acme/acme/_internal/tests/testdata/csr.der b/acme/src/acme/_internal/tests/testdata/csr.der similarity index 100% rename from acme/acme/_internal/tests/testdata/csr.der rename to acme/src/acme/_internal/tests/testdata/csr.der diff --git a/acme/acme/_internal/tests/testdata/csr.pem b/acme/src/acme/_internal/tests/testdata/csr.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/csr.pem rename to acme/src/acme/_internal/tests/testdata/csr.pem diff --git a/acme/acme/_internal/tests/testdata/dsa512_key.pem b/acme/src/acme/_internal/tests/testdata/dsa512_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/dsa512_key.pem rename to acme/src/acme/_internal/tests/testdata/dsa512_key.pem diff --git a/acme/acme/_internal/tests/testdata/ec_secp384r1_key.pem b/acme/src/acme/_internal/tests/testdata/ec_secp384r1_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/ec_secp384r1_key.pem rename to acme/src/acme/_internal/tests/testdata/ec_secp384r1_key.pem diff --git a/acme/acme/_internal/tests/testdata/rsa1024_cert.pem b/acme/src/acme/_internal/tests/testdata/rsa1024_cert.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa1024_cert.pem rename to acme/src/acme/_internal/tests/testdata/rsa1024_cert.pem diff --git a/acme/acme/_internal/tests/testdata/rsa1024_key.pem b/acme/src/acme/_internal/tests/testdata/rsa1024_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa1024_key.pem rename to acme/src/acme/_internal/tests/testdata/rsa1024_key.pem diff --git a/acme/acme/_internal/tests/testdata/rsa2048_cert.pem b/acme/src/acme/_internal/tests/testdata/rsa2048_cert.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa2048_cert.pem rename to acme/src/acme/_internal/tests/testdata/rsa2048_cert.pem diff --git a/acme/acme/_internal/tests/testdata/rsa2048_key.pem b/acme/src/acme/_internal/tests/testdata/rsa2048_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa2048_key.pem rename to acme/src/acme/_internal/tests/testdata/rsa2048_key.pem diff --git a/acme/acme/_internal/tests/testdata/rsa256_key.pem b/acme/src/acme/_internal/tests/testdata/rsa256_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa256_key.pem rename to acme/src/acme/_internal/tests/testdata/rsa256_key.pem diff --git a/acme/acme/_internal/tests/testdata/rsa4096_cert.pem b/acme/src/acme/_internal/tests/testdata/rsa4096_cert.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa4096_cert.pem rename to acme/src/acme/_internal/tests/testdata/rsa4096_cert.pem diff --git a/acme/acme/_internal/tests/testdata/rsa4096_key.pem b/acme/src/acme/_internal/tests/testdata/rsa4096_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa4096_key.pem rename to acme/src/acme/_internal/tests/testdata/rsa4096_key.pem diff --git a/acme/acme/_internal/tests/testdata/rsa512_key.pem b/acme/src/acme/_internal/tests/testdata/rsa512_key.pem similarity index 100% rename from acme/acme/_internal/tests/testdata/rsa512_key.pem rename to acme/src/acme/_internal/tests/testdata/rsa512_key.pem diff --git a/acme/acme/_internal/tests/util_test.py b/acme/src/acme/_internal/tests/util_test.py similarity index 100% rename from acme/acme/_internal/tests/util_test.py rename to acme/src/acme/_internal/tests/util_test.py diff --git a/acme/acme/challenges.py b/acme/src/acme/challenges.py similarity index 100% rename from acme/acme/challenges.py rename to acme/src/acme/challenges.py diff --git a/acme/acme/client.py b/acme/src/acme/client.py similarity index 100% rename from acme/acme/client.py rename to acme/src/acme/client.py diff --git a/acme/acme/crypto_util.py b/acme/src/acme/crypto_util.py similarity index 100% rename from acme/acme/crypto_util.py rename to acme/src/acme/crypto_util.py diff --git a/acme/acme/errors.py b/acme/src/acme/errors.py similarity index 100% rename from acme/acme/errors.py rename to acme/src/acme/errors.py diff --git a/acme/acme/fields.py b/acme/src/acme/fields.py similarity index 100% rename from acme/acme/fields.py rename to acme/src/acme/fields.py diff --git a/acme/acme/jws.py b/acme/src/acme/jws.py similarity index 100% rename from acme/acme/jws.py rename to acme/src/acme/jws.py diff --git a/acme/acme/messages.py b/acme/src/acme/messages.py similarity index 100% rename from acme/acme/messages.py rename to acme/src/acme/messages.py diff --git a/acme/acme/py.typed b/acme/src/acme/py.typed similarity index 100% rename from acme/acme/py.typed rename to acme/src/acme/py.typed diff --git a/acme/acme/standalone.py b/acme/src/acme/standalone.py similarity index 100% rename from acme/acme/standalone.py rename to acme/src/acme/standalone.py diff --git a/acme/acme/util.py b/acme/src/acme/util.py similarity index 100% rename from acme/acme/util.py rename to acme/src/acme/util.py diff --git a/certbot-apache/MANIFEST.in b/certbot-apache/MANIFEST.in index ed73a188e..c3f62235c 100644 --- a/certbot-apache/MANIFEST.in +++ b/certbot-apache/MANIFEST.in @@ -1,8 +1,8 @@ include LICENSE.txt include README.rst -recursive-include certbot_apache/_internal/augeas_lens *.aug -recursive-include certbot_apache/_internal/tls_configs *.conf -recursive-include certbot_apache/_internal/tests/testdata * -include certbot_apache/py.typed +recursive-include src/certbot_apache/_internal/augeas_lens *.aug +recursive-include src/certbot_apache/_internal/tls_configs *.conf +recursive-include src/certbot_apache/_internal/tests/testdata * +include src/certbot_apache/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index 07aca5312..ae2d102eb 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -50,7 +50,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-apache/certbot_apache/__init__.py b/certbot-apache/src/certbot_apache/__init__.py similarity index 100% rename from certbot-apache/certbot_apache/__init__.py rename to certbot-apache/src/certbot_apache/__init__.py diff --git a/certbot-apache/certbot_apache/_internal/__init__.py b/certbot-apache/src/certbot_apache/_internal/__init__.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/__init__.py rename to certbot-apache/src/certbot_apache/_internal/__init__.py diff --git a/certbot-apache/certbot_apache/_internal/apache_util.py b/certbot-apache/src/certbot_apache/_internal/apache_util.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/apache_util.py rename to certbot-apache/src/certbot_apache/_internal/apache_util.py diff --git a/certbot-apache/certbot_apache/_internal/apacheparser.py b/certbot-apache/src/certbot_apache/_internal/apacheparser.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/apacheparser.py rename to certbot-apache/src/certbot_apache/_internal/apacheparser.py diff --git a/certbot-apache/certbot_apache/_internal/assertions.py b/certbot-apache/src/certbot_apache/_internal/assertions.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/assertions.py rename to certbot-apache/src/certbot_apache/_internal/assertions.py diff --git a/certbot-apache/certbot_apache/_internal/augeas_lens/README b/certbot-apache/src/certbot_apache/_internal/augeas_lens/README similarity index 100% rename from certbot-apache/certbot_apache/_internal/augeas_lens/README rename to certbot-apache/src/certbot_apache/_internal/augeas_lens/README diff --git a/certbot-apache/certbot_apache/_internal/augeas_lens/httpd.aug b/certbot-apache/src/certbot_apache/_internal/augeas_lens/httpd.aug similarity index 100% rename from certbot-apache/certbot_apache/_internal/augeas_lens/httpd.aug rename to certbot-apache/src/certbot_apache/_internal/augeas_lens/httpd.aug diff --git a/certbot-apache/certbot_apache/_internal/augeasparser.py b/certbot-apache/src/certbot_apache/_internal/augeasparser.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/augeasparser.py rename to certbot-apache/src/certbot_apache/_internal/augeasparser.py diff --git a/certbot-apache/certbot_apache/_internal/configurator.py b/certbot-apache/src/certbot_apache/_internal/configurator.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/configurator.py rename to certbot-apache/src/certbot_apache/_internal/configurator.py diff --git a/certbot-apache/certbot_apache/_internal/constants.py b/certbot-apache/src/certbot_apache/_internal/constants.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/constants.py rename to certbot-apache/src/certbot_apache/_internal/constants.py diff --git a/certbot-apache/certbot_apache/_internal/display_ops.py b/certbot-apache/src/certbot_apache/_internal/display_ops.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/display_ops.py rename to certbot-apache/src/certbot_apache/_internal/display_ops.py diff --git a/certbot-apache/certbot_apache/_internal/dualparser.py b/certbot-apache/src/certbot_apache/_internal/dualparser.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/dualparser.py rename to certbot-apache/src/certbot_apache/_internal/dualparser.py diff --git a/certbot-apache/certbot_apache/_internal/entrypoint.py b/certbot-apache/src/certbot_apache/_internal/entrypoint.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/entrypoint.py rename to certbot-apache/src/certbot_apache/_internal/entrypoint.py diff --git a/certbot-apache/certbot_apache/_internal/http_01.py b/certbot-apache/src/certbot_apache/_internal/http_01.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/http_01.py rename to certbot-apache/src/certbot_apache/_internal/http_01.py diff --git a/certbot-apache/certbot_apache/_internal/interfaces.py b/certbot-apache/src/certbot_apache/_internal/interfaces.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/interfaces.py rename to certbot-apache/src/certbot_apache/_internal/interfaces.py diff --git a/certbot-apache/certbot_apache/_internal/obj.py b/certbot-apache/src/certbot_apache/_internal/obj.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/obj.py rename to certbot-apache/src/certbot_apache/_internal/obj.py diff --git a/certbot-apache/certbot_apache/_internal/override_alpine.py b/certbot-apache/src/certbot_apache/_internal/override_alpine.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_alpine.py rename to certbot-apache/src/certbot_apache/_internal/override_alpine.py diff --git a/certbot-apache/certbot_apache/_internal/override_arch.py b/certbot-apache/src/certbot_apache/_internal/override_arch.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_arch.py rename to certbot-apache/src/certbot_apache/_internal/override_arch.py diff --git a/certbot-apache/certbot_apache/_internal/override_centos.py b/certbot-apache/src/certbot_apache/_internal/override_centos.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_centos.py rename to certbot-apache/src/certbot_apache/_internal/override_centos.py diff --git a/certbot-apache/certbot_apache/_internal/override_darwin.py b/certbot-apache/src/certbot_apache/_internal/override_darwin.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_darwin.py rename to certbot-apache/src/certbot_apache/_internal/override_darwin.py diff --git a/certbot-apache/certbot_apache/_internal/override_debian.py b/certbot-apache/src/certbot_apache/_internal/override_debian.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_debian.py rename to certbot-apache/src/certbot_apache/_internal/override_debian.py diff --git a/certbot-apache/certbot_apache/_internal/override_fedora.py b/certbot-apache/src/certbot_apache/_internal/override_fedora.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_fedora.py rename to certbot-apache/src/certbot_apache/_internal/override_fedora.py diff --git a/certbot-apache/certbot_apache/_internal/override_gentoo.py b/certbot-apache/src/certbot_apache/_internal/override_gentoo.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_gentoo.py rename to certbot-apache/src/certbot_apache/_internal/override_gentoo.py diff --git a/certbot-apache/certbot_apache/_internal/override_suse.py b/certbot-apache/src/certbot_apache/_internal/override_suse.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_suse.py rename to certbot-apache/src/certbot_apache/_internal/override_suse.py diff --git a/certbot-apache/certbot_apache/_internal/override_void.py b/certbot-apache/src/certbot_apache/_internal/override_void.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/override_void.py rename to certbot-apache/src/certbot_apache/_internal/override_void.py diff --git a/certbot-apache/certbot_apache/_internal/parser.py b/certbot-apache/src/certbot_apache/_internal/parser.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/parser.py rename to certbot-apache/src/certbot_apache/_internal/parser.py diff --git a/certbot-apache/certbot_apache/_internal/parsernode_util.py b/certbot-apache/src/certbot_apache/_internal/parsernode_util.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/parsernode_util.py rename to certbot-apache/src/certbot_apache/_internal/parsernode_util.py diff --git a/certbot-apache/certbot_apache/_internal/tests/__init__.py b/certbot-apache/src/certbot_apache/_internal/tests/__init__.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/__init__.py rename to certbot-apache/src/certbot_apache/_internal/tests/__init__.py diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess diff --git a/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf rename to certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/augeasnode_test.py b/certbot-apache/src/certbot_apache/_internal/tests/augeasnode_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/augeasnode_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/augeasnode_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/autohsts_test.py b/certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/autohsts_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/centos_test.py b/certbot-apache/src/certbot_apache/_internal/tests/centos_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/centos_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/centos_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/complex_parsing_test.py b/certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/complex_parsing_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/configurator_reverter_test.py b/certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/configurator_reverter_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/configurator_test.py b/certbot-apache/src/certbot_apache/_internal/tests/configurator_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/configurator_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/configurator_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/debian_test.py b/certbot-apache/src/certbot_apache/_internal/tests/debian_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/debian_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/debian_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/display_ops_test.py b/certbot-apache/src/certbot_apache/_internal/tests/display_ops_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/display_ops_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/display_ops_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/dualnode_test.py b/certbot-apache/src/certbot_apache/_internal/tests/dualnode_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/dualnode_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/dualnode_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/entrypoint_test.py b/certbot-apache/src/certbot_apache/_internal/tests/entrypoint_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/entrypoint_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/entrypoint_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/fedora_test.py b/certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/fedora_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/gentoo_test.py b/certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/gentoo_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/http_01_test.py b/certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/http_01_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/obj_test.py b/certbot-apache/src/certbot_apache/_internal/tests/obj_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/obj_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/obj_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/parser_test.py b/certbot-apache/src/certbot_apache/_internal/tests/parser_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/parser_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/parser_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/parsernode_configurator_test.py b/certbot-apache/src/certbot_apache/_internal/tests/parsernode_configurator_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/parsernode_configurator_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/parsernode_configurator_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/parsernode_test.py b/certbot-apache/src/certbot_apache/_internal/tests/parsernode_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/parsernode_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/parsernode_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/parsernode_util_test.py b/certbot-apache/src/certbot_apache/_internal/tests/parsernode_util_test.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/parsernode_util_test.py rename to certbot-apache/src/certbot_apache/_internal/tests/parsernode_util_test.py diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd b/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites b/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2 b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2 similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2 rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2 diff --git a/certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites b/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites rename to certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites diff --git a/certbot-apache/certbot_apache/_internal/tests/util.py b/certbot-apache/src/certbot_apache/_internal/tests/util.py similarity index 100% rename from certbot-apache/certbot_apache/_internal/tests/util.py rename to certbot-apache/src/certbot_apache/_internal/tests/util.py diff --git a/certbot-apache/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf b/certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf rename to certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf diff --git a/certbot-apache/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf b/certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf similarity index 100% rename from certbot-apache/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf rename to certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf diff --git a/certbot-apache/certbot_apache/py.typed b/certbot-apache/src/certbot_apache/py.typed similarity index 100% rename from certbot-apache/certbot_apache/py.typed rename to certbot-apache/src/certbot_apache/py.typed diff --git a/certbot-ci/MANIFEST.in b/certbot-ci/MANIFEST.in index 7be27c3dc..55e2107b0 100644 --- a/certbot-ci/MANIFEST.in +++ b/certbot-ci/MANIFEST.in @@ -1,3 +1,3 @@ -recursive-include certbot_integration_tests/assets * -include certbot_integration_tests/py.typed -include snap_integration_tests/py.typed +recursive-include src/certbot_integration_tests/assets * +include src/certbot_integration_tests/py.typed +include src/snap_integration_tests/py.typed diff --git a/certbot-ci/setup.py b/certbot-ci/setup.py index 4c49b8788..62367ef8b 100644 --- a/certbot-ci/setup.py +++ b/certbot-ci/setup.py @@ -48,7 +48,8 @@ setup( 'Topic :: Security', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, diff --git a/certbot-ci/certbot_integration_tests/.coveragerc b/certbot-ci/src/certbot_integration_tests/.coveragerc similarity index 100% rename from certbot-ci/certbot_integration_tests/.coveragerc rename to certbot-ci/src/certbot_integration_tests/.coveragerc diff --git a/certbot-ci/certbot_integration_tests/__init__.py b/certbot-ci/src/certbot_integration_tests/__init__.py similarity index 100% rename from certbot-ci/certbot_integration_tests/__init__.py rename to certbot-ci/src/certbot_integration_tests/__init__.py diff --git a/certbot-ci/certbot_integration_tests/assets/bind-config/conf/named.conf b/certbot-ci/src/certbot_integration_tests/assets/bind-config/conf/named.conf similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/bind-config/conf/named.conf rename to certbot-ci/src/certbot_integration_tests/assets/bind-config/conf/named.conf diff --git a/certbot-ci/certbot_integration_tests/assets/bind-config/rfc2136-credentials-default.ini.tpl b/certbot-ci/src/certbot_integration_tests/assets/bind-config/rfc2136-credentials-default.ini.tpl similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/bind-config/rfc2136-credentials-default.ini.tpl rename to certbot-ci/src/certbot_integration_tests/assets/bind-config/rfc2136-credentials-default.ini.tpl diff --git a/certbot-ci/certbot_integration_tests/assets/bind-config/zones/db.example.com b/certbot-ci/src/certbot_integration_tests/assets/bind-config/zones/db.example.com similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/bind-config/zones/db.example.com rename to certbot-ci/src/certbot_integration_tests/assets/bind-config/zones/db.example.com diff --git a/certbot-ci/certbot_integration_tests/assets/bind-config/zones/db.sub.example.com b/certbot-ci/src/certbot_integration_tests/assets/bind-config/zones/db.sub.example.com similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/bind-config/zones/db.sub.example.com rename to certbot-ci/src/certbot_integration_tests/assets/bind-config/zones/db.sub.example.com diff --git a/certbot-ci/certbot_integration_tests/assets/bind-config/zones/rpz.mock-recursion b/certbot-ci/src/certbot_integration_tests/assets/bind-config/zones/rpz.mock-recursion similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/bind-config/zones/rpz.mock-recursion rename to certbot-ci/src/certbot_integration_tests/assets/bind-config/zones/rpz.mock-recursion diff --git a/certbot-ci/certbot_integration_tests/assets/cert.pem b/certbot-ci/src/certbot_integration_tests/assets/cert.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/cert.pem rename to certbot-ci/src/certbot_integration_tests/assets/cert.pem diff --git a/certbot-ci/certbot_integration_tests/assets/hook.py b/certbot-ci/src/certbot_integration_tests/assets/hook.py similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/hook.py rename to certbot-ci/src/certbot_integration_tests/assets/hook.py diff --git a/certbot-ci/certbot_integration_tests/assets/key.pem b/certbot-ci/src/certbot_integration_tests/assets/key.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/key.pem rename to certbot-ci/src/certbot_integration_tests/assets/key.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json b/certbot-ci/src/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json b/certbot-ci/src/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json b/certbot-ci/src/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/cert1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/cert1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/cert1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/cert1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/chain1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/chain1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/chain1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/chain1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/fullchain1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/fullchain1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/fullchain1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/fullchain1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/privkey1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/privkey1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/privkey1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/a.encryption-example.com/privkey1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/cert1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/cert1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/cert1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/cert1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/chain1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/chain1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/chain1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/chain1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/fullchain1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/fullchain1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/fullchain1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/fullchain1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/privkey1.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/privkey1.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/privkey1.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/b.encryption-example.com/privkey1.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/README b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/README similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/README rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/README diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/cert.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/cert.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/cert.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/cert.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/chain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/chain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/chain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/chain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/fullchain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/fullchain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/fullchain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/fullchain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/privkey.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/privkey.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/privkey.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/archive/c.encryption-example.com/privkey.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/csr/0000_csr-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0000_csr-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/csr/0000_csr-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0000_csr-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/csr/0001_csr-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0001_csr-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/csr/0001_csr-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0001_csr-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/csr/0002_csr-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0002_csr-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/csr/0002_csr-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0002_csr-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/csr/0003_csr-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0003_csr-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/csr/0003_csr-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/csr/0003_csr-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/keys/0000_key-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0000_key-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/keys/0000_key-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0000_key-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/keys/0001_key-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0001_key-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/keys/0001_key-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0001_key-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/keys/0002_key-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0002_key-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/keys/0002_key-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0002_key-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/keys/0003_key-certbot.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0003_key-certbot.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/keys/0003_key-certbot.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/keys/0003_key-certbot.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/README b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/README similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/README rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/README diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/cert.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/cert.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/cert.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/cert.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/chain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/chain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/chain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/chain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/fullchain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/fullchain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/fullchain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/fullchain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/privkey.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/privkey.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/privkey.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/a.encryption-example.com/privkey.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/README b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/README similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/README rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/README diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/cert.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/cert.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/cert.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/cert.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/chain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/chain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/chain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/chain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/fullchain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/fullchain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/fullchain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/fullchain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/privkey.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/privkey.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/privkey.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/b.encryption-example.com/privkey.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/README b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/README similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/README rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/README diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/cert.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/cert.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/cert.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/cert.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/chain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/chain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/chain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/chain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/fullchain.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/fullchain.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/fullchain.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/fullchain.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/privkey.pem b/certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/privkey.pem similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/privkey.pem rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/live/c.encryption-example.com/privkey.pem diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/options-ssl-apache.conf b/certbot-ci/src/certbot_integration_tests/assets/sample-config/options-ssl-apache.conf similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/options-ssl-apache.conf rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/options-ssl-apache.conf diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/renewal/a.encryption-example.com.conf b/certbot-ci/src/certbot_integration_tests/assets/sample-config/renewal/a.encryption-example.com.conf similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/renewal/a.encryption-example.com.conf rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/renewal/a.encryption-example.com.conf diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/renewal/b.encryption-example.com.conf b/certbot-ci/src/certbot_integration_tests/assets/sample-config/renewal/b.encryption-example.com.conf similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/renewal/b.encryption-example.com.conf rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/renewal/b.encryption-example.com.conf diff --git a/certbot-ci/certbot_integration_tests/assets/sample-config/renewal/c.encryption-example.com.conf b/certbot-ci/src/certbot_integration_tests/assets/sample-config/renewal/c.encryption-example.com.conf similarity index 100% rename from certbot-ci/certbot_integration_tests/assets/sample-config/renewal/c.encryption-example.com.conf rename to certbot-ci/src/certbot_integration_tests/assets/sample-config/renewal/c.encryption-example.com.conf diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/__init__.py b/certbot-ci/src/certbot_integration_tests/certbot_tests/__init__.py similarity index 100% rename from certbot-ci/certbot_integration_tests/certbot_tests/__init__.py rename to certbot-ci/src/certbot_integration_tests/certbot_tests/__init__.py diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/assertions.py b/certbot-ci/src/certbot_integration_tests/certbot_tests/assertions.py similarity index 100% rename from certbot-ci/certbot_integration_tests/certbot_tests/assertions.py rename to certbot-ci/src/certbot_integration_tests/certbot_tests/assertions.py diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/context.py b/certbot-ci/src/certbot_integration_tests/certbot_tests/context.py similarity index 100% rename from certbot-ci/certbot_integration_tests/certbot_tests/context.py rename to certbot-ci/src/certbot_integration_tests/certbot_tests/context.py diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py b/certbot-ci/src/certbot_integration_tests/certbot_tests/test_main.py similarity index 100% rename from certbot-ci/certbot_integration_tests/certbot_tests/test_main.py rename to certbot-ci/src/certbot_integration_tests/certbot_tests/test_main.py diff --git a/certbot-ci/certbot_integration_tests/conftest.py b/certbot-ci/src/certbot_integration_tests/conftest.py similarity index 100% rename from certbot-ci/certbot_integration_tests/conftest.py rename to certbot-ci/src/certbot_integration_tests/conftest.py diff --git a/certbot-ci/certbot_integration_tests/nginx_tests/__init__.py b/certbot-ci/src/certbot_integration_tests/nginx_tests/__init__.py similarity index 100% rename from certbot-ci/certbot_integration_tests/nginx_tests/__init__.py rename to certbot-ci/src/certbot_integration_tests/nginx_tests/__init__.py diff --git a/certbot-ci/certbot_integration_tests/nginx_tests/context.py b/certbot-ci/src/certbot_integration_tests/nginx_tests/context.py similarity index 100% rename from certbot-ci/certbot_integration_tests/nginx_tests/context.py rename to certbot-ci/src/certbot_integration_tests/nginx_tests/context.py diff --git a/certbot-ci/certbot_integration_tests/nginx_tests/nginx_config.py b/certbot-ci/src/certbot_integration_tests/nginx_tests/nginx_config.py similarity index 100% rename from certbot-ci/certbot_integration_tests/nginx_tests/nginx_config.py rename to certbot-ci/src/certbot_integration_tests/nginx_tests/nginx_config.py diff --git a/certbot-ci/certbot_integration_tests/nginx_tests/test_main.py b/certbot-ci/src/certbot_integration_tests/nginx_tests/test_main.py similarity index 100% rename from certbot-ci/certbot_integration_tests/nginx_tests/test_main.py rename to certbot-ci/src/certbot_integration_tests/nginx_tests/test_main.py diff --git a/certbot-ci/certbot_integration_tests/py.typed b/certbot-ci/src/certbot_integration_tests/py.typed similarity index 100% rename from certbot-ci/certbot_integration_tests/py.typed rename to certbot-ci/src/certbot_integration_tests/py.typed diff --git a/certbot-ci/certbot_integration_tests/rfc2136_tests/__init__.py b/certbot-ci/src/certbot_integration_tests/rfc2136_tests/__init__.py similarity index 100% rename from certbot-ci/certbot_integration_tests/rfc2136_tests/__init__.py rename to certbot-ci/src/certbot_integration_tests/rfc2136_tests/__init__.py diff --git a/certbot-ci/certbot_integration_tests/rfc2136_tests/context.py b/certbot-ci/src/certbot_integration_tests/rfc2136_tests/context.py similarity index 100% rename from certbot-ci/certbot_integration_tests/rfc2136_tests/context.py rename to certbot-ci/src/certbot_integration_tests/rfc2136_tests/context.py diff --git a/certbot-ci/certbot_integration_tests/rfc2136_tests/test_main.py b/certbot-ci/src/certbot_integration_tests/rfc2136_tests/test_main.py similarity index 100% rename from certbot-ci/certbot_integration_tests/rfc2136_tests/test_main.py rename to certbot-ci/src/certbot_integration_tests/rfc2136_tests/test_main.py diff --git a/certbot-ci/certbot_integration_tests/utils/__init__.py b/certbot-ci/src/certbot_integration_tests/utils/__init__.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/__init__.py rename to certbot-ci/src/certbot_integration_tests/utils/__init__.py diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/src/certbot_integration_tests/utils/acme_server.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/acme_server.py rename to certbot-ci/src/certbot_integration_tests/utils/acme_server.py diff --git a/certbot-ci/certbot_integration_tests/utils/certbot_call.py b/certbot-ci/src/certbot_integration_tests/utils/certbot_call.py similarity index 98% rename from certbot-ci/certbot_integration_tests/utils/certbot_call.py rename to certbot-ci/src/certbot_integration_tests/utils/certbot_call.py index 6c42a9c79..757b5be2f 100755 --- a/certbot-ci/certbot_integration_tests/utils/certbot_call.py +++ b/certbot-ci/src/certbot_integration_tests/utils/certbot_call.py @@ -67,7 +67,7 @@ def _prepare_environ(workspace: str) -> Dict[str, str]: # if PYTHONPATH is set, it does not contain the path to the root of the codebase. if new_environ.get('PYTHONPATH'): # certbot_integration_tests.__file__ is: - # '/path/to/certbot/certbot-ci/certbot_integration_tests/__init__.pyc' + # '/path/to/certbot/certbot-ci/src/certbot_integration_tests/__init__.pyc' # ... and we want '/path/to/certbot' certbot_root = os.path.dirname(os.path.dirname( os.path.dirname(certbot_integration_tests.__file__)) diff --git a/certbot-ci/certbot_integration_tests/utils/constants.py b/certbot-ci/src/certbot_integration_tests/utils/constants.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/constants.py rename to certbot-ci/src/certbot_integration_tests/utils/constants.py diff --git a/certbot-ci/certbot_integration_tests/utils/dns_server.py b/certbot-ci/src/certbot_integration_tests/utils/dns_server.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/dns_server.py rename to certbot-ci/src/certbot_integration_tests/utils/dns_server.py diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/src/certbot_integration_tests/utils/misc.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/misc.py rename to certbot-ci/src/certbot_integration_tests/utils/misc.py diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py b/certbot-ci/src/certbot_integration_tests/utils/pebble_artifacts.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py rename to certbot-ci/src/certbot_integration_tests/utils/pebble_artifacts.py diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py b/certbot-ci/src/certbot_integration_tests/utils/pebble_ocsp_server.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/pebble_ocsp_server.py rename to certbot-ci/src/certbot_integration_tests/utils/pebble_ocsp_server.py diff --git a/certbot-ci/certbot_integration_tests/utils/proxy.py b/certbot-ci/src/certbot_integration_tests/utils/proxy.py similarity index 100% rename from certbot-ci/certbot_integration_tests/utils/proxy.py rename to certbot-ci/src/certbot_integration_tests/utils/proxy.py diff --git a/certbot-ci/snap_integration_tests/__init__.py b/certbot-ci/src/snap_integration_tests/__init__.py similarity index 100% rename from certbot-ci/snap_integration_tests/__init__.py rename to certbot-ci/src/snap_integration_tests/__init__.py diff --git a/certbot-ci/snap_integration_tests/conftest.py b/certbot-ci/src/snap_integration_tests/conftest.py similarity index 100% rename from certbot-ci/snap_integration_tests/conftest.py rename to certbot-ci/src/snap_integration_tests/conftest.py diff --git a/certbot-ci/snap_integration_tests/dns_tests/__init__.py b/certbot-ci/src/snap_integration_tests/dns_tests/__init__.py similarity index 100% rename from certbot-ci/snap_integration_tests/dns_tests/__init__.py rename to certbot-ci/src/snap_integration_tests/dns_tests/__init__.py diff --git a/certbot-ci/snap_integration_tests/dns_tests/test_main.py b/certbot-ci/src/snap_integration_tests/dns_tests/test_main.py similarity index 100% rename from certbot-ci/snap_integration_tests/dns_tests/test_main.py rename to certbot-ci/src/snap_integration_tests/dns_tests/test_main.py diff --git a/certbot-ci/snap_integration_tests/py.typed b/certbot-ci/src/snap_integration_tests/py.typed similarity index 100% rename from certbot-ci/snap_integration_tests/py.typed rename to certbot-ci/src/snap_integration_tests/py.typed diff --git a/certbot-compatibility-test/Dockerfile b/certbot-compatibility-test/Dockerfile index 34a530979..a4ba766d4 100644 --- a/certbot-compatibility-test/Dockerfile +++ b/certbot-compatibility-test/Dockerfile @@ -20,4 +20,4 @@ ENV PATH /opt/certbot/src/venv/bin:$PATH # this might also help in debugging: you can "docker run --entrypoint # bash" and investigate, apply patches, etc. -WORKDIR /opt/certbot/src/certbot-compatibility-test/certbot_compatibility_test/testdata +WORKDIR /opt/certbot/src/certbot-compatibility-test/src/certbot_compatibility_test/testdata diff --git a/certbot-compatibility-test/MANIFEST.in b/certbot-compatibility-test/MANIFEST.in index a9d4f5ce7..911da598e 100644 --- a/certbot-compatibility-test/MANIFEST.in +++ b/certbot-compatibility-test/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst -include certbot_compatibility_test/configurators/apache/a2enmod.sh -include certbot_compatibility_test/configurators/apache/a2dismod.sh -include certbot_compatibility_test/configurators/apache/Dockerfile -recursive-include certbot_compatibility_test/testdata * +include src/certbot_compatibility_test/configurators/apache/a2enmod.sh +include src/certbot_compatibility_test/configurators/apache/a2dismod.sh +include src/certbot_compatibility_test/configurators/apache/Dockerfile +recursive-include src/certbot_compatibility_test/testdata * diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py index d83a68404..9f2516b38 100644 --- a/certbot-compatibility-test/setup.py +++ b/certbot-compatibility-test/setup.py @@ -34,7 +34,8 @@ setup( 'Topic :: Security', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, entry_points={ diff --git a/certbot-compatibility-test/certbot_compatibility_test/__init__.py b/certbot-compatibility-test/src/certbot_compatibility_test/__init__.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/__init__.py rename to certbot-compatibility-test/src/certbot_compatibility_test/__init__.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/__init__.py b/certbot-compatibility-test/src/certbot_compatibility_test/configurators/__init__.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/configurators/__init__.py rename to certbot-compatibility-test/src/certbot_compatibility_test/configurators/__init__.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/apache/__init__.py b/certbot-compatibility-test/src/certbot_compatibility_test/configurators/apache/__init__.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/configurators/apache/__init__.py rename to certbot-compatibility-test/src/certbot_compatibility_test/configurators/apache/__init__.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py b/certbot-compatibility-test/src/certbot_compatibility_test/configurators/apache/common.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/configurators/apache/common.py rename to certbot-compatibility-test/src/certbot_compatibility_test/configurators/apache/common.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py b/certbot-compatibility-test/src/certbot_compatibility_test/configurators/common.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/configurators/common.py rename to certbot-compatibility-test/src/certbot_compatibility_test/configurators/common.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/__init__.py b/certbot-compatibility-test/src/certbot_compatibility_test/configurators/nginx/__init__.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/__init__.py rename to certbot-compatibility-test/src/certbot_compatibility_test/configurators/nginx/__init__.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py b/certbot-compatibility-test/src/certbot_compatibility_test/configurators/nginx/common.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/configurators/nginx/common.py rename to certbot-compatibility-test/src/certbot_compatibility_test/configurators/nginx/common.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/errors.py b/certbot-compatibility-test/src/certbot_compatibility_test/errors.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/errors.py rename to certbot-compatibility-test/src/certbot_compatibility_test/errors.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/interfaces.py b/certbot-compatibility-test/src/certbot_compatibility_test/interfaces.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/interfaces.py rename to certbot-compatibility-test/src/certbot_compatibility_test/interfaces.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/test_driver.py b/certbot-compatibility-test/src/certbot_compatibility_test/test_driver.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/test_driver.py rename to certbot-compatibility-test/src/certbot_compatibility_test/test_driver.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/testdata/apache.tar.gz b/certbot-compatibility-test/src/certbot_compatibility_test/testdata/apache.tar.gz similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/testdata/apache.tar.gz rename to certbot-compatibility-test/src/certbot_compatibility_test/testdata/apache.tar.gz diff --git a/certbot-compatibility-test/certbot_compatibility_test/testdata/empty_cert.pem b/certbot-compatibility-test/src/certbot_compatibility_test/testdata/empty_cert.pem similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/testdata/empty_cert.pem rename to certbot-compatibility-test/src/certbot_compatibility_test/testdata/empty_cert.pem diff --git a/certbot-compatibility-test/certbot_compatibility_test/testdata/nginx.tar.gz b/certbot-compatibility-test/src/certbot_compatibility_test/testdata/nginx.tar.gz similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/testdata/nginx.tar.gz rename to certbot-compatibility-test/src/certbot_compatibility_test/testdata/nginx.tar.gz diff --git a/certbot-compatibility-test/certbot_compatibility_test/util.py b/certbot-compatibility-test/src/certbot_compatibility_test/util.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/util.py rename to certbot-compatibility-test/src/certbot_compatibility_test/util.py diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/src/certbot_compatibility_test/validator.py similarity index 100% rename from certbot-compatibility-test/certbot_compatibility_test/validator.py rename to certbot-compatibility-test/src/certbot_compatibility_test/validator.py diff --git a/certbot-dns-cloudflare/MANIFEST.in b/certbot-dns-cloudflare/MANIFEST.in index 40765a39d..8a849f092 100644 --- a/certbot-dns-cloudflare/MANIFEST.in +++ b/certbot-dns-cloudflare/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_cloudflare/py.typed +include src/certbot_dns_cloudflare/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index bd24fec27..b7b40634c 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -62,7 +62,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/__init__.py b/certbot-dns-cloudflare/src/certbot_dns_cloudflare/__init__.py similarity index 100% rename from certbot-dns-cloudflare/certbot_dns_cloudflare/__init__.py rename to certbot-dns-cloudflare/src/certbot_dns_cloudflare/__init__.py diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/__init__.py b/certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/__init__.py similarity index 100% rename from certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/__init__.py rename to certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/__init__.py diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py b/certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/dns_cloudflare.py similarity index 100% rename from certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/dns_cloudflare.py rename to certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/dns_cloudflare.py diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/tests/__init__.py b/certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/tests/__init__.py rename to certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/tests/__init__.py diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/tests/dns_cloudflare_test.py b/certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/tests/dns_cloudflare_test.py similarity index 100% rename from certbot-dns-cloudflare/certbot_dns_cloudflare/_internal/tests/dns_cloudflare_test.py rename to certbot-dns-cloudflare/src/certbot_dns_cloudflare/_internal/tests/dns_cloudflare_test.py diff --git a/certbot-dns-cloudflare/certbot_dns_cloudflare/py.typed b/certbot-dns-cloudflare/src/certbot_dns_cloudflare/py.typed similarity index 100% rename from certbot-dns-cloudflare/certbot_dns_cloudflare/py.typed rename to certbot-dns-cloudflare/src/certbot_dns_cloudflare/py.typed diff --git a/certbot-dns-digitalocean/MANIFEST.in b/certbot-dns-digitalocean/MANIFEST.in index 1e0a83569..decb38135 100644 --- a/certbot-dns-digitalocean/MANIFEST.in +++ b/certbot-dns-digitalocean/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_digitalocean/py.typed +include src/certbot_dns_digitalocean/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 1f9d9ee5b..86de32643 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/__init__.py b/certbot-dns-digitalocean/src/certbot_dns_digitalocean/__init__.py similarity index 100% rename from certbot-dns-digitalocean/certbot_dns_digitalocean/__init__.py rename to certbot-dns-digitalocean/src/certbot_dns_digitalocean/__init__.py diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/__init__.py b/certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/__init__.py similarity index 100% rename from certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/__init__.py rename to certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/__init__.py diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/dns_digitalocean.py b/certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/dns_digitalocean.py similarity index 100% rename from certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/dns_digitalocean.py rename to certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/dns_digitalocean.py diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/tests/__init__.py b/certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/tests/__init__.py rename to certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/tests/__init__.py diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/tests/dns_digitalocean_test.py b/certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/tests/dns_digitalocean_test.py similarity index 100% rename from certbot-dns-digitalocean/certbot_dns_digitalocean/_internal/tests/dns_digitalocean_test.py rename to certbot-dns-digitalocean/src/certbot_dns_digitalocean/_internal/tests/dns_digitalocean_test.py diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/py.typed b/certbot-dns-digitalocean/src/certbot_dns_digitalocean/py.typed similarity index 100% rename from certbot-dns-digitalocean/certbot_dns_digitalocean/py.typed rename to certbot-dns-digitalocean/src/certbot_dns_digitalocean/py.typed diff --git a/certbot-dns-dnsimple/MANIFEST.in b/certbot-dns-dnsimple/MANIFEST.in index af8af4c29..9004f3e48 100644 --- a/certbot-dns-dnsimple/MANIFEST.in +++ b/certbot-dns-dnsimple/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_dnsimple/py.typed +include src/certbot_dns_dnsimple/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 56b323239..ac2eb4657 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -62,7 +62,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/__init__.py b/certbot-dns-dnsimple/src/certbot_dns_dnsimple/__init__.py similarity index 100% rename from certbot-dns-dnsimple/certbot_dns_dnsimple/__init__.py rename to certbot-dns-dnsimple/src/certbot_dns_dnsimple/__init__.py diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/__init__.py b/certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/__init__.py similarity index 100% rename from certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/__init__.py rename to certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/__init__.py diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py b/certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/dns_dnsimple.py similarity index 100% rename from certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py rename to certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/dns_dnsimple.py diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/tests/__init__.py b/certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/tests/__init__.py rename to certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/tests/__init__.py diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/tests/dns_dnsimple_test.py b/certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/tests/dns_dnsimple_test.py similarity index 100% rename from certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/tests/dns_dnsimple_test.py rename to certbot-dns-dnsimple/src/certbot_dns_dnsimple/_internal/tests/dns_dnsimple_test.py diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/py.typed b/certbot-dns-dnsimple/src/certbot_dns_dnsimple/py.typed similarity index 100% rename from certbot-dns-dnsimple/certbot_dns_dnsimple/py.typed rename to certbot-dns-dnsimple/src/certbot_dns_dnsimple/py.typed diff --git a/certbot-dns-dnsmadeeasy/MANIFEST.in b/certbot-dns-dnsmadeeasy/MANIFEST.in index 7d6af8f57..1d6bcc4f3 100644 --- a/certbot-dns-dnsmadeeasy/MANIFEST.in +++ b/certbot-dns-dnsmadeeasy/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_dnsmadeeasy/py.typed +include src/certbot_dns_dnsmadeeasy/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index da5e6b960..9d0ede6c9 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/__init__.py b/certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/__init__.py similarity index 100% rename from certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/__init__.py rename to certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/__init__.py diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/__init__.py b/certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/__init__.py similarity index 100% rename from certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/__init__.py rename to certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/__init__.py diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py b/certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py similarity index 100% rename from certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py rename to certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/tests/__init__.py b/certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/tests/__init__.py rename to certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/tests/__init__.py diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/tests/dns_dnsmadeeasy_test.py b/certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/tests/dns_dnsmadeeasy_test.py similarity index 100% rename from certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/tests/dns_dnsmadeeasy_test.py rename to certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/_internal/tests/dns_dnsmadeeasy_test.py diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/py.typed b/certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/py.typed similarity index 100% rename from certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/py.typed rename to certbot-dns-dnsmadeeasy/src/certbot_dns_dnsmadeeasy/py.typed diff --git a/certbot-dns-gehirn/MANIFEST.in b/certbot-dns-gehirn/MANIFEST.in index 31f5b9373..4733013ff 100644 --- a/certbot-dns-gehirn/MANIFEST.in +++ b/certbot-dns-gehirn/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_gehirn/py.typed +include src/certbot_dns_gehirn/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index 12cc94397..405c57e54 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-gehirn/certbot_dns_gehirn/__init__.py b/certbot-dns-gehirn/src/certbot_dns_gehirn/__init__.py similarity index 100% rename from certbot-dns-gehirn/certbot_dns_gehirn/__init__.py rename to certbot-dns-gehirn/src/certbot_dns_gehirn/__init__.py diff --git a/certbot-dns-gehirn/certbot_dns_gehirn/_internal/__init__.py b/certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/__init__.py similarity index 100% rename from certbot-dns-gehirn/certbot_dns_gehirn/_internal/__init__.py rename to certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/__init__.py diff --git a/certbot-dns-gehirn/certbot_dns_gehirn/_internal/dns_gehirn.py b/certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/dns_gehirn.py similarity index 100% rename from certbot-dns-gehirn/certbot_dns_gehirn/_internal/dns_gehirn.py rename to certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/dns_gehirn.py diff --git a/certbot-dns-gehirn/certbot_dns_gehirn/_internal/tests/__init__.py b/certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-gehirn/certbot_dns_gehirn/_internal/tests/__init__.py rename to certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/tests/__init__.py diff --git a/certbot-dns-gehirn/certbot_dns_gehirn/_internal/tests/dns_gehirn_test.py b/certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/tests/dns_gehirn_test.py similarity index 100% rename from certbot-dns-gehirn/certbot_dns_gehirn/_internal/tests/dns_gehirn_test.py rename to certbot-dns-gehirn/src/certbot_dns_gehirn/_internal/tests/dns_gehirn_test.py diff --git a/certbot-dns-gehirn/certbot_dns_gehirn/py.typed b/certbot-dns-gehirn/src/certbot_dns_gehirn/py.typed similarity index 100% rename from certbot-dns-gehirn/certbot_dns_gehirn/py.typed rename to certbot-dns-gehirn/src/certbot_dns_gehirn/py.typed diff --git a/certbot-dns-google/MANIFEST.in b/certbot-dns-google/MANIFEST.in index da8f308b4..00d2f2f04 100644 --- a/certbot-dns-google/MANIFEST.in +++ b/certbot-dns-google/MANIFEST.in @@ -1,7 +1,7 @@ include LICENSE.txt include README.rst recursive-include docs * -recursive-include certbot_dns_google/_internal/tests/testdata * -include certbot_dns_google/py.typed +recursive-include src/certbot_dns_google/_internal/tests/testdata * +include src/certbot_dns_google/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index 65be10cf0..e6372ea11 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -61,7 +61,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-google/certbot_dns_google/__init__.py b/certbot-dns-google/src/certbot_dns_google/__init__.py similarity index 100% rename from certbot-dns-google/certbot_dns_google/__init__.py rename to certbot-dns-google/src/certbot_dns_google/__init__.py diff --git a/certbot-dns-google/certbot_dns_google/_internal/__init__.py b/certbot-dns-google/src/certbot_dns_google/_internal/__init__.py similarity index 100% rename from certbot-dns-google/certbot_dns_google/_internal/__init__.py rename to certbot-dns-google/src/certbot_dns_google/_internal/__init__.py diff --git a/certbot-dns-google/certbot_dns_google/_internal/dns_google.py b/certbot-dns-google/src/certbot_dns_google/_internal/dns_google.py similarity index 100% rename from certbot-dns-google/certbot_dns_google/_internal/dns_google.py rename to certbot-dns-google/src/certbot_dns_google/_internal/dns_google.py diff --git a/certbot-dns-google/certbot_dns_google/_internal/tests/__init__.py b/certbot-dns-google/src/certbot_dns_google/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-google/certbot_dns_google/_internal/tests/__init__.py rename to certbot-dns-google/src/certbot_dns_google/_internal/tests/__init__.py diff --git a/certbot-dns-google/certbot_dns_google/_internal/tests/dns_google_test.py b/certbot-dns-google/src/certbot_dns_google/_internal/tests/dns_google_test.py similarity index 100% rename from certbot-dns-google/certbot_dns_google/_internal/tests/dns_google_test.py rename to certbot-dns-google/src/certbot_dns_google/_internal/tests/dns_google_test.py diff --git a/certbot-dns-google/certbot_dns_google/_internal/tests/testdata/discovery.json b/certbot-dns-google/src/certbot_dns_google/_internal/tests/testdata/discovery.json similarity index 100% rename from certbot-dns-google/certbot_dns_google/_internal/tests/testdata/discovery.json rename to certbot-dns-google/src/certbot_dns_google/_internal/tests/testdata/discovery.json diff --git a/certbot-dns-google/certbot_dns_google/py.typed b/certbot-dns-google/src/certbot_dns_google/py.typed similarity index 100% rename from certbot-dns-google/certbot_dns_google/py.typed rename to certbot-dns-google/src/certbot_dns_google/py.typed diff --git a/certbot-dns-linode/MANIFEST.in b/certbot-dns-linode/MANIFEST.in index cf0cb2095..cb3218895 100644 --- a/certbot-dns-linode/MANIFEST.in +++ b/certbot-dns-linode/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_linode/py.typed +include src/certbot_dns_linode/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index 7e01b3c64..f000cec6a 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-linode/certbot_dns_linode/__init__.py b/certbot-dns-linode/src/certbot_dns_linode/__init__.py similarity index 100% rename from certbot-dns-linode/certbot_dns_linode/__init__.py rename to certbot-dns-linode/src/certbot_dns_linode/__init__.py diff --git a/certbot-dns-linode/certbot_dns_linode/_internal/__init__.py b/certbot-dns-linode/src/certbot_dns_linode/_internal/__init__.py similarity index 100% rename from certbot-dns-linode/certbot_dns_linode/_internal/__init__.py rename to certbot-dns-linode/src/certbot_dns_linode/_internal/__init__.py diff --git a/certbot-dns-linode/certbot_dns_linode/_internal/dns_linode.py b/certbot-dns-linode/src/certbot_dns_linode/_internal/dns_linode.py similarity index 100% rename from certbot-dns-linode/certbot_dns_linode/_internal/dns_linode.py rename to certbot-dns-linode/src/certbot_dns_linode/_internal/dns_linode.py diff --git a/certbot-dns-linode/certbot_dns_linode/_internal/tests/__init__.py b/certbot-dns-linode/src/certbot_dns_linode/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-linode/certbot_dns_linode/_internal/tests/__init__.py rename to certbot-dns-linode/src/certbot_dns_linode/_internal/tests/__init__.py diff --git a/certbot-dns-linode/certbot_dns_linode/_internal/tests/dns_linode_test.py b/certbot-dns-linode/src/certbot_dns_linode/_internal/tests/dns_linode_test.py similarity index 100% rename from certbot-dns-linode/certbot_dns_linode/_internal/tests/dns_linode_test.py rename to certbot-dns-linode/src/certbot_dns_linode/_internal/tests/dns_linode_test.py diff --git a/certbot-dns-linode/certbot_dns_linode/py.typed b/certbot-dns-linode/src/certbot_dns_linode/py.typed similarity index 100% rename from certbot-dns-linode/certbot_dns_linode/py.typed rename to certbot-dns-linode/src/certbot_dns_linode/py.typed diff --git a/certbot-dns-luadns/MANIFEST.in b/certbot-dns-luadns/MANIFEST.in index a85086559..8193d7a7f 100644 --- a/certbot-dns-luadns/MANIFEST.in +++ b/certbot-dns-luadns/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_luadns/py.typed +include src/certbot_dns_luadns/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index cf8e63b60..40ac4349b 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-luadns/certbot_dns_luadns/__init__.py b/certbot-dns-luadns/src/certbot_dns_luadns/__init__.py similarity index 100% rename from certbot-dns-luadns/certbot_dns_luadns/__init__.py rename to certbot-dns-luadns/src/certbot_dns_luadns/__init__.py diff --git a/certbot-dns-luadns/certbot_dns_luadns/_internal/__init__.py b/certbot-dns-luadns/src/certbot_dns_luadns/_internal/__init__.py similarity index 100% rename from certbot-dns-luadns/certbot_dns_luadns/_internal/__init__.py rename to certbot-dns-luadns/src/certbot_dns_luadns/_internal/__init__.py diff --git a/certbot-dns-luadns/certbot_dns_luadns/_internal/dns_luadns.py b/certbot-dns-luadns/src/certbot_dns_luadns/_internal/dns_luadns.py similarity index 100% rename from certbot-dns-luadns/certbot_dns_luadns/_internal/dns_luadns.py rename to certbot-dns-luadns/src/certbot_dns_luadns/_internal/dns_luadns.py diff --git a/certbot-dns-luadns/certbot_dns_luadns/_internal/tests/__init__.py b/certbot-dns-luadns/src/certbot_dns_luadns/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-luadns/certbot_dns_luadns/_internal/tests/__init__.py rename to certbot-dns-luadns/src/certbot_dns_luadns/_internal/tests/__init__.py diff --git a/certbot-dns-luadns/certbot_dns_luadns/_internal/tests/dns_luadns_test.py b/certbot-dns-luadns/src/certbot_dns_luadns/_internal/tests/dns_luadns_test.py similarity index 100% rename from certbot-dns-luadns/certbot_dns_luadns/_internal/tests/dns_luadns_test.py rename to certbot-dns-luadns/src/certbot_dns_luadns/_internal/tests/dns_luadns_test.py diff --git a/certbot-dns-luadns/certbot_dns_luadns/py.typed b/certbot-dns-luadns/src/certbot_dns_luadns/py.typed similarity index 100% rename from certbot-dns-luadns/certbot_dns_luadns/py.typed rename to certbot-dns-luadns/src/certbot_dns_luadns/py.typed diff --git a/certbot-dns-nsone/MANIFEST.in b/certbot-dns-nsone/MANIFEST.in index 24453af9a..23139f7ee 100644 --- a/certbot-dns-nsone/MANIFEST.in +++ b/certbot-dns-nsone/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_nsone/py.typed +include src/certbot_dns_nsone/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index da9df2252..13b97a6a4 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-nsone/certbot_dns_nsone/__init__.py b/certbot-dns-nsone/src/certbot_dns_nsone/__init__.py similarity index 100% rename from certbot-dns-nsone/certbot_dns_nsone/__init__.py rename to certbot-dns-nsone/src/certbot_dns_nsone/__init__.py diff --git a/certbot-dns-nsone/certbot_dns_nsone/_internal/__init__.py b/certbot-dns-nsone/src/certbot_dns_nsone/_internal/__init__.py similarity index 100% rename from certbot-dns-nsone/certbot_dns_nsone/_internal/__init__.py rename to certbot-dns-nsone/src/certbot_dns_nsone/_internal/__init__.py diff --git a/certbot-dns-nsone/certbot_dns_nsone/_internal/dns_nsone.py b/certbot-dns-nsone/src/certbot_dns_nsone/_internal/dns_nsone.py similarity index 100% rename from certbot-dns-nsone/certbot_dns_nsone/_internal/dns_nsone.py rename to certbot-dns-nsone/src/certbot_dns_nsone/_internal/dns_nsone.py diff --git a/certbot-dns-nsone/certbot_dns_nsone/_internal/tests/__init__.py b/certbot-dns-nsone/src/certbot_dns_nsone/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-nsone/certbot_dns_nsone/_internal/tests/__init__.py rename to certbot-dns-nsone/src/certbot_dns_nsone/_internal/tests/__init__.py diff --git a/certbot-dns-nsone/certbot_dns_nsone/_internal/tests/dns_nsone_test.py b/certbot-dns-nsone/src/certbot_dns_nsone/_internal/tests/dns_nsone_test.py similarity index 100% rename from certbot-dns-nsone/certbot_dns_nsone/_internal/tests/dns_nsone_test.py rename to certbot-dns-nsone/src/certbot_dns_nsone/_internal/tests/dns_nsone_test.py diff --git a/certbot-dns-nsone/certbot_dns_nsone/py.typed b/certbot-dns-nsone/src/certbot_dns_nsone/py.typed similarity index 100% rename from certbot-dns-nsone/certbot_dns_nsone/py.typed rename to certbot-dns-nsone/src/certbot_dns_nsone/py.typed diff --git a/certbot-dns-ovh/MANIFEST.in b/certbot-dns-ovh/MANIFEST.in index 9e7bdcb78..1f0b301c0 100644 --- a/certbot-dns-ovh/MANIFEST.in +++ b/certbot-dns-ovh/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_ovh/py.typed +include src/certbot_dns_ovh/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index 4271661a0..0abd4d249 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-ovh/certbot_dns_ovh/__init__.py b/certbot-dns-ovh/src/certbot_dns_ovh/__init__.py similarity index 100% rename from certbot-dns-ovh/certbot_dns_ovh/__init__.py rename to certbot-dns-ovh/src/certbot_dns_ovh/__init__.py diff --git a/certbot-dns-ovh/certbot_dns_ovh/_internal/__init__.py b/certbot-dns-ovh/src/certbot_dns_ovh/_internal/__init__.py similarity index 100% rename from certbot-dns-ovh/certbot_dns_ovh/_internal/__init__.py rename to certbot-dns-ovh/src/certbot_dns_ovh/_internal/__init__.py diff --git a/certbot-dns-ovh/certbot_dns_ovh/_internal/dns_ovh.py b/certbot-dns-ovh/src/certbot_dns_ovh/_internal/dns_ovh.py similarity index 100% rename from certbot-dns-ovh/certbot_dns_ovh/_internal/dns_ovh.py rename to certbot-dns-ovh/src/certbot_dns_ovh/_internal/dns_ovh.py diff --git a/certbot-dns-ovh/certbot_dns_ovh/_internal/tests/__init__.py b/certbot-dns-ovh/src/certbot_dns_ovh/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-ovh/certbot_dns_ovh/_internal/tests/__init__.py rename to certbot-dns-ovh/src/certbot_dns_ovh/_internal/tests/__init__.py diff --git a/certbot-dns-ovh/certbot_dns_ovh/_internal/tests/dns_ovh_test.py b/certbot-dns-ovh/src/certbot_dns_ovh/_internal/tests/dns_ovh_test.py similarity index 100% rename from certbot-dns-ovh/certbot_dns_ovh/_internal/tests/dns_ovh_test.py rename to certbot-dns-ovh/src/certbot_dns_ovh/_internal/tests/dns_ovh_test.py diff --git a/certbot-dns-ovh/certbot_dns_ovh/py.typed b/certbot-dns-ovh/src/certbot_dns_ovh/py.typed similarity index 100% rename from certbot-dns-ovh/certbot_dns_ovh/py.typed rename to certbot-dns-ovh/src/certbot_dns_ovh/py.typed diff --git a/certbot-dns-rfc2136/MANIFEST.in b/certbot-dns-rfc2136/MANIFEST.in index 298aeab71..a86536d59 100644 --- a/certbot-dns-rfc2136/MANIFEST.in +++ b/certbot-dns-rfc2136/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_rfc2136/py.typed +include src/certbot_dns_rfc2136/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index ad8cd10ba..871b32d4d 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -63,7 +63,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/__init__.py b/certbot-dns-rfc2136/src/certbot_dns_rfc2136/__init__.py similarity index 100% rename from certbot-dns-rfc2136/certbot_dns_rfc2136/__init__.py rename to certbot-dns-rfc2136/src/certbot_dns_rfc2136/__init__.py diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/__init__.py b/certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/__init__.py similarity index 100% rename from certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/__init__.py rename to certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/__init__.py diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/dns_rfc2136.py b/certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/dns_rfc2136.py similarity index 100% rename from certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/dns_rfc2136.py rename to certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/dns_rfc2136.py diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/tests/__init__.py b/certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/tests/__init__.py rename to certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/tests/__init__.py diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/tests/dns_rfc2136_test.py b/certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/tests/dns_rfc2136_test.py similarity index 100% rename from certbot-dns-rfc2136/certbot_dns_rfc2136/_internal/tests/dns_rfc2136_test.py rename to certbot-dns-rfc2136/src/certbot_dns_rfc2136/_internal/tests/dns_rfc2136_test.py diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/py.typed b/certbot-dns-rfc2136/src/certbot_dns_rfc2136/py.typed similarity index 100% rename from certbot-dns-rfc2136/certbot_dns_rfc2136/py.typed rename to certbot-dns-rfc2136/src/certbot_dns_rfc2136/py.typed diff --git a/certbot-dns-route53/MANIFEST.in b/certbot-dns-route53/MANIFEST.in index a5df132f1..3011f3ac1 100644 --- a/certbot-dns-route53/MANIFEST.in +++ b/certbot-dns-route53/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_route53/py.typed +include src/certbot_dns_route53/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index fa4e0bdc7..020bc38f7 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -59,7 +59,8 @@ setup( 'Topic :: System :: Systems Administration', 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, keywords=['certbot', 'route53', 'aws'], diff --git a/certbot-dns-route53/certbot_dns_route53/__init__.py b/certbot-dns-route53/src/certbot_dns_route53/__init__.py similarity index 100% rename from certbot-dns-route53/certbot_dns_route53/__init__.py rename to certbot-dns-route53/src/certbot_dns_route53/__init__.py diff --git a/certbot-dns-route53/certbot_dns_route53/_internal/__init__.py b/certbot-dns-route53/src/certbot_dns_route53/_internal/__init__.py similarity index 100% rename from certbot-dns-route53/certbot_dns_route53/_internal/__init__.py rename to certbot-dns-route53/src/certbot_dns_route53/_internal/__init__.py diff --git a/certbot-dns-route53/certbot_dns_route53/_internal/dns_route53.py b/certbot-dns-route53/src/certbot_dns_route53/_internal/dns_route53.py similarity index 100% rename from certbot-dns-route53/certbot_dns_route53/_internal/dns_route53.py rename to certbot-dns-route53/src/certbot_dns_route53/_internal/dns_route53.py diff --git a/certbot-dns-route53/certbot_dns_route53/_internal/tests/__init__.py b/certbot-dns-route53/src/certbot_dns_route53/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-route53/certbot_dns_route53/_internal/tests/__init__.py rename to certbot-dns-route53/src/certbot_dns_route53/_internal/tests/__init__.py diff --git a/certbot-dns-route53/certbot_dns_route53/_internal/tests/dns_route53_test.py b/certbot-dns-route53/src/certbot_dns_route53/_internal/tests/dns_route53_test.py similarity index 100% rename from certbot-dns-route53/certbot_dns_route53/_internal/tests/dns_route53_test.py rename to certbot-dns-route53/src/certbot_dns_route53/_internal/tests/dns_route53_test.py diff --git a/certbot-dns-route53/certbot_dns_route53/py.typed b/certbot-dns-route53/src/certbot_dns_route53/py.typed similarity index 100% rename from certbot-dns-route53/certbot_dns_route53/py.typed rename to certbot-dns-route53/src/certbot_dns_route53/py.typed diff --git a/certbot-dns-sakuracloud/MANIFEST.in b/certbot-dns-sakuracloud/MANIFEST.in index 0a97923fe..7ce321fe3 100644 --- a/certbot-dns-sakuracloud/MANIFEST.in +++ b/certbot-dns-sakuracloud/MANIFEST.in @@ -1,6 +1,6 @@ include LICENSE.txt include README.rst recursive-include docs * -include certbot_dns_sakuracloud/py.typed +include src/certbot_dns_sakuracloud/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index e0d8c3372..db3ad1513 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -60,7 +60,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-dns-sakuracloud/certbot_dns_sakuracloud/__init__.py b/certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/__init__.py similarity index 100% rename from certbot-dns-sakuracloud/certbot_dns_sakuracloud/__init__.py rename to certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/__init__.py diff --git a/certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/__init__.py b/certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/__init__.py similarity index 100% rename from certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/__init__.py rename to certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/__init__.py diff --git a/certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/dns_sakuracloud.py b/certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/dns_sakuracloud.py similarity index 100% rename from certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/dns_sakuracloud.py rename to certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/dns_sakuracloud.py diff --git a/certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/tests/__init__.py b/certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/tests/__init__.py similarity index 100% rename from certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/tests/__init__.py rename to certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/tests/__init__.py diff --git a/certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/tests/dns_sakuracloud_test.py b/certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/tests/dns_sakuracloud_test.py similarity index 100% rename from certbot-dns-sakuracloud/certbot_dns_sakuracloud/_internal/tests/dns_sakuracloud_test.py rename to certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/_internal/tests/dns_sakuracloud_test.py diff --git a/certbot-dns-sakuracloud/certbot_dns_sakuracloud/py.typed b/certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/py.typed similarity index 100% rename from certbot-dns-sakuracloud/certbot_dns_sakuracloud/py.typed rename to certbot-dns-sakuracloud/src/certbot_dns_sakuracloud/py.typed diff --git a/certbot-nginx/MANIFEST.in b/certbot-nginx/MANIFEST.in index 41fd46f5a..46694e82f 100644 --- a/certbot-nginx/MANIFEST.in +++ b/certbot-nginx/MANIFEST.in @@ -1,7 +1,7 @@ include LICENSE.txt include README.rst -recursive-include certbot_nginx/_internal/tls_configs *.conf -recursive-include certbot_nginx/_internal/tests/testdata * -include certbot_nginx/py.typed +recursive-include src/certbot_nginx/_internal/tls_configs *.conf +recursive-include src/certbot_nginx/_internal/tests/testdata * +include src/certbot_nginx/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index ec76a0d1f..766f3304a 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -49,7 +49,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(), + packages=find_packages(where='src'), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, extras_require={ diff --git a/certbot-nginx/certbot_nginx/__init__.py b/certbot-nginx/src/certbot_nginx/__init__.py similarity index 100% rename from certbot-nginx/certbot_nginx/__init__.py rename to certbot-nginx/src/certbot_nginx/__init__.py diff --git a/certbot-nginx/certbot_nginx/_internal/__init__.py b/certbot-nginx/src/certbot_nginx/_internal/__init__.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/__init__.py rename to certbot-nginx/src/certbot_nginx/_internal/__init__.py diff --git a/certbot-nginx/certbot_nginx/_internal/configurator.py b/certbot-nginx/src/certbot_nginx/_internal/configurator.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/configurator.py rename to certbot-nginx/src/certbot_nginx/_internal/configurator.py diff --git a/certbot-nginx/certbot_nginx/_internal/constants.py b/certbot-nginx/src/certbot_nginx/_internal/constants.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/constants.py rename to certbot-nginx/src/certbot_nginx/_internal/constants.py diff --git a/certbot-nginx/certbot_nginx/_internal/display_ops.py b/certbot-nginx/src/certbot_nginx/_internal/display_ops.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/display_ops.py rename to certbot-nginx/src/certbot_nginx/_internal/display_ops.py diff --git a/certbot-nginx/certbot_nginx/_internal/http_01.py b/certbot-nginx/src/certbot_nginx/_internal/http_01.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/http_01.py rename to certbot-nginx/src/certbot_nginx/_internal/http_01.py diff --git a/certbot-nginx/certbot_nginx/_internal/nginxparser.py b/certbot-nginx/src/certbot_nginx/_internal/nginxparser.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/nginxparser.py rename to certbot-nginx/src/certbot_nginx/_internal/nginxparser.py diff --git a/certbot-nginx/certbot_nginx/_internal/obj.py b/certbot-nginx/src/certbot_nginx/_internal/obj.py similarity index 99% rename from certbot-nginx/certbot_nginx/_internal/obj.py rename to certbot-nginx/src/certbot_nginx/_internal/obj.py index 67249ce4a..77db56a56 100644 --- a/certbot-nginx/certbot_nginx/_internal/obj.py +++ b/certbot-nginx/src/certbot_nginx/_internal/obj.py @@ -138,7 +138,7 @@ class Addr(common.Addr): def __hash__(self) -> int: # pylint: disable=useless-super-delegation # Python 3 requires explicit overridden for __hash__ - # See certbot-apache/certbot_apache/_internal/obj.py for more information + # See certbot-apache/src/certbot_apache/_internal/obj.py for more information return super().__hash__() def super_eq(self, other: "Addr") -> bool: diff --git a/certbot-nginx/certbot_nginx/_internal/parser.py b/certbot-nginx/src/certbot_nginx/_internal/parser.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/parser.py rename to certbot-nginx/src/certbot_nginx/_internal/parser.py diff --git a/certbot-nginx/certbot_nginx/_internal/parser_obj.py b/certbot-nginx/src/certbot_nginx/_internal/parser_obj.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/parser_obj.py rename to certbot-nginx/src/certbot_nginx/_internal/parser_obj.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/__init__.py b/certbot-nginx/src/certbot_nginx/_internal/tests/__init__.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/__init__.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/__init__.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/configurator_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/configurator_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/configurator_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/configurator_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/display_ops_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/display_ops_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/display_ops_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/display_ops_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/http_01_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/http_01_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/http_01_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/http_01_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/nginxparser_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/nginxparser_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/nginxparser_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/nginxparser_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/obj_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/obj_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/obj_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/obj_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/parser_obj_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/parser_obj_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/parser_obj_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/parser_obj_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/parser_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/parser_test.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/parser_test.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/parser_test.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/test_util.py b/certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/test_util.py rename to certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/broken.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/broken.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/broken.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/broken.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/comment_in_file.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/comment_in_file.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/comment_in_file.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/comment_in_file.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/edge_cases.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/edge_cases.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/edge_cases.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/edge_cases.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/foo.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/foo.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/foo.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/foo.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/invalid_unicode_comments.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/invalid_unicode_comments.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/invalid_unicode_comments.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/invalid_unicode_comments.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/mime.types b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/mime.types similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/mime.types rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/mime.types diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/minimalistic_comments.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/minimalistic_comments.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/minimalistic_comments.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/minimalistic_comments.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/multiline_quotes.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/multiline_quotes.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/multiline_quotes.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/multiline_quotes.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx-include.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx-include.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx-include.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx-include.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/nginx.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/server.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/server.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/server.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/server.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/addr-80.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/addr-80.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/addr-80.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/addr-80.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/both.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/both.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/both.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/both.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/default b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/default similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/default rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/default diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.net b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.net similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.net rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/example.net diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/globalssl.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/globalssl.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/globalssl.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/globalssl.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/headers.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/headers.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/headers.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/headers.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/ipv6ssl.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/migration.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/migration.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/migration.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/migration.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/sslon.com b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/sslon.com similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/sslon.com rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/sites-enabled/sslon.com diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf diff --git a/certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/valid_unicode_comments.conf b/certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/valid_unicode_comments.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tests/testdata/etc_nginx/valid_unicode_comments.conf rename to certbot-nginx/src/certbot_nginx/_internal/tests/testdata/etc_nginx/valid_unicode_comments.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx-old.conf b/certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx-old.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx-old.conf rename to certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx-old.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls12-only.conf b/certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls12-only.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls12-only.conf rename to certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls12-only.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls13-session-tix-on.conf b/certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls13-session-tix-on.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls13-session-tix-on.conf rename to certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx-tls13-session-tix-on.conf diff --git a/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf b/certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf similarity index 100% rename from certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf rename to certbot-nginx/src/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf diff --git a/certbot-nginx/certbot_nginx/py.typed b/certbot-nginx/src/certbot_nginx/py.typed similarity index 100% rename from certbot-nginx/certbot_nginx/py.typed rename to certbot-nginx/src/certbot_nginx/py.typed diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 787cc5ddb..e5396144f 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -10,7 +10,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Changed -* +* Switched to src-layout from flat-layout to accommodate PEP 517 pip editable installs ### Fixed diff --git a/certbot/MANIFEST.in b/certbot/MANIFEST.in index 6214bfe95..1e397fb3d 100644 --- a/certbot/MANIFEST.in +++ b/certbot/MANIFEST.in @@ -3,8 +3,8 @@ include CHANGELOG.md include LICENSE.txt recursive-include docs * recursive-include examples * -recursive-include certbot/tests/testdata * -include certbot/ssl-dhparams.pem -include certbot/py.typed +recursive-include src/certbot/tests/testdata * +include src/certbot/ssl-dhparams.pem +include src/certbot/py.typed global-exclude __pycache__ global-exclude *.py[cod] diff --git a/certbot/docs/conf.py b/certbot/docs/conf.py index a9de28591..f644836c2 100644 --- a/certbot/docs/conf.py +++ b/certbot/docs/conf.py @@ -22,7 +22,7 @@ import sphinx here = os.path.abspath(os.path.dirname(__file__)) # read version number (and other metadata) from package init -init_fn = os.path.join(here, '..', 'certbot', '__init__.py') +init_fn = os.path.join(here, '..', 'src', 'certbot', '__init__.py') with codecs.open(init_fn, encoding='utf8') as fd: meta = dict(re.findall(r"""__([a-z]+)__ = '([^']+)""", fd.read())) diff --git a/certbot/docs/contributing.rst b/certbot/docs/contributing.rst index 5fc3897aa..9825caea2 100644 --- a/certbot/docs/contributing.rst +++ b/certbot/docs/contributing.rst @@ -140,13 +140,13 @@ If you're working on a specific test and would like to run just that one: .. code-block:: shell - pytest acme/acme/_internal/tests/messages_test.py # Use the test file you're working on + pytest acme/src/acme/_internal/tests/messages_test.py # Use the test file you're working on To run a specific test case within a file: .. code-block:: shell - pytest acme/acme/_internal/tests/messages_test.py -k test_to_partial_json + pytest acme/src/acme/_internal/tests/messages_test.py -k test_to_partial_json For debugging, we recommend putting ``import ipdb; ipdb.set_trace()`` statements inside the source code, which will require @@ -261,8 +261,8 @@ certificate once it is issued. Some plugins, like the built-in Apache and Nginx plugins, implement both interfaces and perform both tasks. Others, like the built-in Standalone authenticator, implement just one interface. -.. _interfaces.py: https://github.com/certbot/certbot/blob/main/certbot/certbot/interfaces.py -.. _plugins/common.py: https://github.com/certbot/certbot/blob/main/certbot/certbot/plugins/common.py#L45 +.. _interfaces.py: https://github.com/certbot/certbot/blob/main/certbot/src/certbot/interfaces.py +.. _plugins/common.py: https://github.com/certbot/certbot/blob/main/certbot/src/certbot/plugins/common.py#L45 Authenticators diff --git a/certbot/docs/using.rst b/certbot/docs/using.rst index b288692d0..a1f89d308 100644 --- a/certbot/docs/using.rst +++ b/certbot/docs/using.rst @@ -99,7 +99,7 @@ Apache ------ The Apache plugin currently `supports -`_ +`_ modern OSes based on Debian, Fedora, SUSE, Gentoo, CentOS and Darwin. This automates both obtaining *and* installing certificates on an Apache webserver. To specify this plugin on the command line, simply include diff --git a/certbot/setup.py b/certbot/setup.py index 7685b7839..0f0e2da34 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -15,7 +15,7 @@ def read_file(filename, encoding='utf8'): here = os.path.abspath(os.path.dirname(__file__)) # read version number (and other metadata) from package init -init_fn = os.path.join(here, 'certbot', '__init__.py') +init_fn = os.path.join(here, 'src', 'certbot', '__init__.py') meta = dict(re.findall(r"""__([a-z]+)__ = '([^']+)""", read_file(init_fn))) readme = read_file(os.path.join(here, 'README.rst')) @@ -33,7 +33,7 @@ install_requires = [ 'configobj>=5.0.6', 'cryptography>=43.0.0', 'distro>=1.0.1', - 'importlib_metadata>=4.6; python_version < "3.10"', + 'importlib_metadata>=8.6.1; python_version < "3.10"', 'josepy>=2.0.0', 'parsedatetime>=2.4', 'pyrfc3339', @@ -117,7 +117,8 @@ setup( 'Topic :: Utilities', ], - packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']), + packages=find_packages(where='src', exclude=['docs', 'examples', 'tests', 'venv']), + package_dir={'': 'src'}, include_package_data=True, install_requires=install_requires, diff --git a/certbot/certbot/__init__.py b/certbot/src/certbot/__init__.py similarity index 100% rename from certbot/certbot/__init__.py rename to certbot/src/certbot/__init__.py diff --git a/certbot/certbot/_internal/__init__.py b/certbot/src/certbot/_internal/__init__.py similarity index 100% rename from certbot/certbot/_internal/__init__.py rename to certbot/src/certbot/_internal/__init__.py diff --git a/certbot/certbot/_internal/account.py b/certbot/src/certbot/_internal/account.py similarity index 100% rename from certbot/certbot/_internal/account.py rename to certbot/src/certbot/_internal/account.py diff --git a/certbot/certbot/_internal/auth_handler.py b/certbot/src/certbot/_internal/auth_handler.py similarity index 100% rename from certbot/certbot/_internal/auth_handler.py rename to certbot/src/certbot/_internal/auth_handler.py diff --git a/certbot/certbot/_internal/cert_manager.py b/certbot/src/certbot/_internal/cert_manager.py similarity index 100% rename from certbot/certbot/_internal/cert_manager.py rename to certbot/src/certbot/_internal/cert_manager.py diff --git a/certbot/certbot/_internal/cli/__init__.py b/certbot/src/certbot/_internal/cli/__init__.py similarity index 100% rename from certbot/certbot/_internal/cli/__init__.py rename to certbot/src/certbot/_internal/cli/__init__.py diff --git a/certbot/certbot/_internal/cli/cli_constants.py b/certbot/src/certbot/_internal/cli/cli_constants.py similarity index 100% rename from certbot/certbot/_internal/cli/cli_constants.py rename to certbot/src/certbot/_internal/cli/cli_constants.py diff --git a/certbot/certbot/_internal/cli/cli_utils.py b/certbot/src/certbot/_internal/cli/cli_utils.py similarity index 100% rename from certbot/certbot/_internal/cli/cli_utils.py rename to certbot/src/certbot/_internal/cli/cli_utils.py diff --git a/certbot/certbot/_internal/cli/group_adder.py b/certbot/src/certbot/_internal/cli/group_adder.py similarity index 100% rename from certbot/certbot/_internal/cli/group_adder.py rename to certbot/src/certbot/_internal/cli/group_adder.py diff --git a/certbot/certbot/_internal/cli/helpful.py b/certbot/src/certbot/_internal/cli/helpful.py similarity index 100% rename from certbot/certbot/_internal/cli/helpful.py rename to certbot/src/certbot/_internal/cli/helpful.py diff --git a/certbot/certbot/_internal/cli/paths_parser.py b/certbot/src/certbot/_internal/cli/paths_parser.py similarity index 100% rename from certbot/certbot/_internal/cli/paths_parser.py rename to certbot/src/certbot/_internal/cli/paths_parser.py diff --git a/certbot/certbot/_internal/cli/plugins_parsing.py b/certbot/src/certbot/_internal/cli/plugins_parsing.py similarity index 100% rename from certbot/certbot/_internal/cli/plugins_parsing.py rename to certbot/src/certbot/_internal/cli/plugins_parsing.py diff --git a/certbot/certbot/_internal/cli/subparsers.py b/certbot/src/certbot/_internal/cli/subparsers.py similarity index 100% rename from certbot/certbot/_internal/cli/subparsers.py rename to certbot/src/certbot/_internal/cli/subparsers.py diff --git a/certbot/certbot/_internal/cli/verb_help.py b/certbot/src/certbot/_internal/cli/verb_help.py similarity index 100% rename from certbot/certbot/_internal/cli/verb_help.py rename to certbot/src/certbot/_internal/cli/verb_help.py diff --git a/certbot/certbot/_internal/client.py b/certbot/src/certbot/_internal/client.py similarity index 100% rename from certbot/certbot/_internal/client.py rename to certbot/src/certbot/_internal/client.py diff --git a/certbot/certbot/_internal/constants.py b/certbot/src/certbot/_internal/constants.py similarity index 100% rename from certbot/certbot/_internal/constants.py rename to certbot/src/certbot/_internal/constants.py diff --git a/certbot/certbot/_internal/display/__init__.py b/certbot/src/certbot/_internal/display/__init__.py similarity index 100% rename from certbot/certbot/_internal/display/__init__.py rename to certbot/src/certbot/_internal/display/__init__.py diff --git a/certbot/certbot/_internal/display/completer.py b/certbot/src/certbot/_internal/display/completer.py similarity index 100% rename from certbot/certbot/_internal/display/completer.py rename to certbot/src/certbot/_internal/display/completer.py diff --git a/certbot/certbot/_internal/display/dummy_readline.py b/certbot/src/certbot/_internal/display/dummy_readline.py similarity index 100% rename from certbot/certbot/_internal/display/dummy_readline.py rename to certbot/src/certbot/_internal/display/dummy_readline.py diff --git a/certbot/certbot/_internal/display/obj.py b/certbot/src/certbot/_internal/display/obj.py similarity index 100% rename from certbot/certbot/_internal/display/obj.py rename to certbot/src/certbot/_internal/display/obj.py diff --git a/certbot/certbot/_internal/display/util.py b/certbot/src/certbot/_internal/display/util.py similarity index 100% rename from certbot/certbot/_internal/display/util.py rename to certbot/src/certbot/_internal/display/util.py diff --git a/certbot/certbot/_internal/eff.py b/certbot/src/certbot/_internal/eff.py similarity index 100% rename from certbot/certbot/_internal/eff.py rename to certbot/src/certbot/_internal/eff.py diff --git a/certbot/certbot/_internal/error_handler.py b/certbot/src/certbot/_internal/error_handler.py similarity index 100% rename from certbot/certbot/_internal/error_handler.py rename to certbot/src/certbot/_internal/error_handler.py diff --git a/certbot/certbot/_internal/hooks.py b/certbot/src/certbot/_internal/hooks.py similarity index 100% rename from certbot/certbot/_internal/hooks.py rename to certbot/src/certbot/_internal/hooks.py diff --git a/certbot/certbot/_internal/lock.py b/certbot/src/certbot/_internal/lock.py similarity index 100% rename from certbot/certbot/_internal/lock.py rename to certbot/src/certbot/_internal/lock.py diff --git a/certbot/certbot/_internal/log.py b/certbot/src/certbot/_internal/log.py similarity index 100% rename from certbot/certbot/_internal/log.py rename to certbot/src/certbot/_internal/log.py diff --git a/certbot/certbot/_internal/main.py b/certbot/src/certbot/_internal/main.py similarity index 100% rename from certbot/certbot/_internal/main.py rename to certbot/src/certbot/_internal/main.py diff --git a/certbot/certbot/_internal/plugins/__init__.py b/certbot/src/certbot/_internal/plugins/__init__.py similarity index 100% rename from certbot/certbot/_internal/plugins/__init__.py rename to certbot/src/certbot/_internal/plugins/__init__.py diff --git a/certbot/certbot/_internal/plugins/disco.py b/certbot/src/certbot/_internal/plugins/disco.py similarity index 100% rename from certbot/certbot/_internal/plugins/disco.py rename to certbot/src/certbot/_internal/plugins/disco.py diff --git a/certbot/certbot/_internal/plugins/manual.py b/certbot/src/certbot/_internal/plugins/manual.py similarity index 100% rename from certbot/certbot/_internal/plugins/manual.py rename to certbot/src/certbot/_internal/plugins/manual.py diff --git a/certbot/certbot/_internal/plugins/null.py b/certbot/src/certbot/_internal/plugins/null.py similarity index 100% rename from certbot/certbot/_internal/plugins/null.py rename to certbot/src/certbot/_internal/plugins/null.py diff --git a/certbot/certbot/_internal/plugins/selection.py b/certbot/src/certbot/_internal/plugins/selection.py similarity index 100% rename from certbot/certbot/_internal/plugins/selection.py rename to certbot/src/certbot/_internal/plugins/selection.py diff --git a/certbot/certbot/_internal/plugins/standalone.py b/certbot/src/certbot/_internal/plugins/standalone.py similarity index 100% rename from certbot/certbot/_internal/plugins/standalone.py rename to certbot/src/certbot/_internal/plugins/standalone.py diff --git a/certbot/certbot/_internal/plugins/webroot.py b/certbot/src/certbot/_internal/plugins/webroot.py similarity index 100% rename from certbot/certbot/_internal/plugins/webroot.py rename to certbot/src/certbot/_internal/plugins/webroot.py diff --git a/certbot/certbot/_internal/renewal.py b/certbot/src/certbot/_internal/renewal.py similarity index 100% rename from certbot/certbot/_internal/renewal.py rename to certbot/src/certbot/_internal/renewal.py diff --git a/certbot/certbot/_internal/snap_config.py b/certbot/src/certbot/_internal/snap_config.py similarity index 100% rename from certbot/certbot/_internal/snap_config.py rename to certbot/src/certbot/_internal/snap_config.py diff --git a/certbot/certbot/_internal/storage.py b/certbot/src/certbot/_internal/storage.py similarity index 100% rename from certbot/certbot/_internal/storage.py rename to certbot/src/certbot/_internal/storage.py diff --git a/certbot/certbot/_internal/tests/__init__.py b/certbot/src/certbot/_internal/tests/__init__.py similarity index 100% rename from certbot/certbot/_internal/tests/__init__.py rename to certbot/src/certbot/_internal/tests/__init__.py diff --git a/certbot/certbot/_internal/tests/account_test.py b/certbot/src/certbot/_internal/tests/account_test.py similarity index 100% rename from certbot/certbot/_internal/tests/account_test.py rename to certbot/src/certbot/_internal/tests/account_test.py diff --git a/certbot/certbot/_internal/tests/auth_handler_test.py b/certbot/src/certbot/_internal/tests/auth_handler_test.py similarity index 100% rename from certbot/certbot/_internal/tests/auth_handler_test.py rename to certbot/src/certbot/_internal/tests/auth_handler_test.py diff --git a/certbot/certbot/_internal/tests/cert_manager_test.py b/certbot/src/certbot/_internal/tests/cert_manager_test.py similarity index 100% rename from certbot/certbot/_internal/tests/cert_manager_test.py rename to certbot/src/certbot/_internal/tests/cert_manager_test.py diff --git a/certbot/certbot/_internal/tests/cli_test.py b/certbot/src/certbot/_internal/tests/cli_test.py similarity index 100% rename from certbot/certbot/_internal/tests/cli_test.py rename to certbot/src/certbot/_internal/tests/cli_test.py diff --git a/certbot/certbot/_internal/tests/client_test.py b/certbot/src/certbot/_internal/tests/client_test.py similarity index 100% rename from certbot/certbot/_internal/tests/client_test.py rename to certbot/src/certbot/_internal/tests/client_test.py diff --git a/certbot/certbot/_internal/tests/compat/__init__.py b/certbot/src/certbot/_internal/tests/compat/__init__.py similarity index 100% rename from certbot/certbot/_internal/tests/compat/__init__.py rename to certbot/src/certbot/_internal/tests/compat/__init__.py diff --git a/certbot/certbot/_internal/tests/compat/filesystem_test.py b/certbot/src/certbot/_internal/tests/compat/filesystem_test.py similarity index 100% rename from certbot/certbot/_internal/tests/compat/filesystem_test.py rename to certbot/src/certbot/_internal/tests/compat/filesystem_test.py diff --git a/certbot/certbot/_internal/tests/compat/misc_test.py b/certbot/src/certbot/_internal/tests/compat/misc_test.py similarity index 100% rename from certbot/certbot/_internal/tests/compat/misc_test.py rename to certbot/src/certbot/_internal/tests/compat/misc_test.py diff --git a/certbot/certbot/_internal/tests/compat/os_test.py b/certbot/src/certbot/_internal/tests/compat/os_test.py similarity index 100% rename from certbot/certbot/_internal/tests/compat/os_test.py rename to certbot/src/certbot/_internal/tests/compat/os_test.py diff --git a/certbot/certbot/_internal/tests/configuration_test.py b/certbot/src/certbot/_internal/tests/configuration_test.py similarity index 100% rename from certbot/certbot/_internal/tests/configuration_test.py rename to certbot/src/certbot/_internal/tests/configuration_test.py diff --git a/certbot/certbot/_internal/tests/crypto_util_test.py b/certbot/src/certbot/_internal/tests/crypto_util_test.py similarity index 100% rename from certbot/certbot/_internal/tests/crypto_util_test.py rename to certbot/src/certbot/_internal/tests/crypto_util_test.py diff --git a/certbot/certbot/_internal/tests/display/__init__.py b/certbot/src/certbot/_internal/tests/display/__init__.py similarity index 100% rename from certbot/certbot/_internal/tests/display/__init__.py rename to certbot/src/certbot/_internal/tests/display/__init__.py diff --git a/certbot/certbot/_internal/tests/display/completer_test.py b/certbot/src/certbot/_internal/tests/display/completer_test.py similarity index 100% rename from certbot/certbot/_internal/tests/display/completer_test.py rename to certbot/src/certbot/_internal/tests/display/completer_test.py diff --git a/certbot/certbot/_internal/tests/display/internal_util_test.py b/certbot/src/certbot/_internal/tests/display/internal_util_test.py similarity index 100% rename from certbot/certbot/_internal/tests/display/internal_util_test.py rename to certbot/src/certbot/_internal/tests/display/internal_util_test.py diff --git a/certbot/certbot/_internal/tests/display/obj_test.py b/certbot/src/certbot/_internal/tests/display/obj_test.py similarity index 100% rename from certbot/certbot/_internal/tests/display/obj_test.py rename to certbot/src/certbot/_internal/tests/display/obj_test.py diff --git a/certbot/certbot/_internal/tests/display/ops_test.py b/certbot/src/certbot/_internal/tests/display/ops_test.py similarity index 100% rename from certbot/certbot/_internal/tests/display/ops_test.py rename to certbot/src/certbot/_internal/tests/display/ops_test.py diff --git a/certbot/certbot/_internal/tests/display/util_test.py b/certbot/src/certbot/_internal/tests/display/util_test.py similarity index 100% rename from certbot/certbot/_internal/tests/display/util_test.py rename to certbot/src/certbot/_internal/tests/display/util_test.py diff --git a/certbot/certbot/_internal/tests/eff_test.py b/certbot/src/certbot/_internal/tests/eff_test.py similarity index 100% rename from certbot/certbot/_internal/tests/eff_test.py rename to certbot/src/certbot/_internal/tests/eff_test.py diff --git a/certbot/certbot/_internal/tests/error_handler_test.py b/certbot/src/certbot/_internal/tests/error_handler_test.py similarity index 100% rename from certbot/certbot/_internal/tests/error_handler_test.py rename to certbot/src/certbot/_internal/tests/error_handler_test.py diff --git a/certbot/certbot/_internal/tests/errors_test.py b/certbot/src/certbot/_internal/tests/errors_test.py similarity index 100% rename from certbot/certbot/_internal/tests/errors_test.py rename to certbot/src/certbot/_internal/tests/errors_test.py diff --git a/certbot/certbot/_internal/tests/helpful_test.py b/certbot/src/certbot/_internal/tests/helpful_test.py similarity index 100% rename from certbot/certbot/_internal/tests/helpful_test.py rename to certbot/src/certbot/_internal/tests/helpful_test.py diff --git a/certbot/certbot/_internal/tests/hook_test.py b/certbot/src/certbot/_internal/tests/hook_test.py similarity index 100% rename from certbot/certbot/_internal/tests/hook_test.py rename to certbot/src/certbot/_internal/tests/hook_test.py diff --git a/certbot/certbot/_internal/tests/lock_test.py b/certbot/src/certbot/_internal/tests/lock_test.py similarity index 100% rename from certbot/certbot/_internal/tests/lock_test.py rename to certbot/src/certbot/_internal/tests/lock_test.py diff --git a/certbot/certbot/_internal/tests/log_test.py b/certbot/src/certbot/_internal/tests/log_test.py similarity index 100% rename from certbot/certbot/_internal/tests/log_test.py rename to certbot/src/certbot/_internal/tests/log_test.py diff --git a/certbot/certbot/_internal/tests/main_test.py b/certbot/src/certbot/_internal/tests/main_test.py similarity index 100% rename from certbot/certbot/_internal/tests/main_test.py rename to certbot/src/certbot/_internal/tests/main_test.py diff --git a/certbot/certbot/_internal/tests/ocsp_test.py b/certbot/src/certbot/_internal/tests/ocsp_test.py similarity index 100% rename from certbot/certbot/_internal/tests/ocsp_test.py rename to certbot/src/certbot/_internal/tests/ocsp_test.py diff --git a/certbot/certbot/_internal/tests/plugins/__init__.py b/certbot/src/certbot/_internal/tests/plugins/__init__.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/__init__.py rename to certbot/src/certbot/_internal/tests/plugins/__init__.py diff --git a/certbot/certbot/_internal/tests/plugins/common_test.py b/certbot/src/certbot/_internal/tests/plugins/common_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/common_test.py rename to certbot/src/certbot/_internal/tests/plugins/common_test.py diff --git a/certbot/certbot/_internal/tests/plugins/disco_test.py b/certbot/src/certbot/_internal/tests/plugins/disco_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/disco_test.py rename to certbot/src/certbot/_internal/tests/plugins/disco_test.py diff --git a/certbot/certbot/_internal/tests/plugins/dns_common_test.py b/certbot/src/certbot/_internal/tests/plugins/dns_common_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/dns_common_test.py rename to certbot/src/certbot/_internal/tests/plugins/dns_common_test.py diff --git a/certbot/certbot/_internal/tests/plugins/enhancements_test.py b/certbot/src/certbot/_internal/tests/plugins/enhancements_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/enhancements_test.py rename to certbot/src/certbot/_internal/tests/plugins/enhancements_test.py diff --git a/certbot/certbot/_internal/tests/plugins/manual_test.py b/certbot/src/certbot/_internal/tests/plugins/manual_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/manual_test.py rename to certbot/src/certbot/_internal/tests/plugins/manual_test.py diff --git a/certbot/certbot/_internal/tests/plugins/null_test.py b/certbot/src/certbot/_internal/tests/plugins/null_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/null_test.py rename to certbot/src/certbot/_internal/tests/plugins/null_test.py diff --git a/certbot/certbot/_internal/tests/plugins/selection_test.py b/certbot/src/certbot/_internal/tests/plugins/selection_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/selection_test.py rename to certbot/src/certbot/_internal/tests/plugins/selection_test.py diff --git a/certbot/certbot/_internal/tests/plugins/standalone_test.py b/certbot/src/certbot/_internal/tests/plugins/standalone_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/standalone_test.py rename to certbot/src/certbot/_internal/tests/plugins/standalone_test.py diff --git a/certbot/certbot/_internal/tests/plugins/storage_test.py b/certbot/src/certbot/_internal/tests/plugins/storage_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/storage_test.py rename to certbot/src/certbot/_internal/tests/plugins/storage_test.py diff --git a/certbot/certbot/_internal/tests/plugins/util_test.py b/certbot/src/certbot/_internal/tests/plugins/util_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/util_test.py rename to certbot/src/certbot/_internal/tests/plugins/util_test.py diff --git a/certbot/certbot/_internal/tests/plugins/webroot_test.py b/certbot/src/certbot/_internal/tests/plugins/webroot_test.py similarity index 100% rename from certbot/certbot/_internal/tests/plugins/webroot_test.py rename to certbot/src/certbot/_internal/tests/plugins/webroot_test.py diff --git a/certbot/certbot/_internal/tests/renewal_test.py b/certbot/src/certbot/_internal/tests/renewal_test.py similarity index 100% rename from certbot/certbot/_internal/tests/renewal_test.py rename to certbot/src/certbot/_internal/tests/renewal_test.py diff --git a/certbot/certbot/_internal/tests/renewupdater_test.py b/certbot/src/certbot/_internal/tests/renewupdater_test.py similarity index 100% rename from certbot/certbot/_internal/tests/renewupdater_test.py rename to certbot/src/certbot/_internal/tests/renewupdater_test.py diff --git a/certbot/certbot/_internal/tests/reverter_test.py b/certbot/src/certbot/_internal/tests/reverter_test.py similarity index 100% rename from certbot/certbot/_internal/tests/reverter_test.py rename to certbot/src/certbot/_internal/tests/reverter_test.py diff --git a/certbot/certbot/_internal/tests/storage_test.py b/certbot/src/certbot/_internal/tests/storage_test.py similarity index 100% rename from certbot/certbot/_internal/tests/storage_test.py rename to certbot/src/certbot/_internal/tests/storage_test.py diff --git a/certbot/certbot/_internal/tests/util_test.py b/certbot/src/certbot/_internal/tests/util_test.py similarity index 100% rename from certbot/certbot/_internal/tests/util_test.py rename to certbot/src/certbot/_internal/tests/util_test.py diff --git a/certbot/certbot/_internal/updater.py b/certbot/src/certbot/_internal/updater.py similarity index 100% rename from certbot/certbot/_internal/updater.py rename to certbot/src/certbot/_internal/updater.py diff --git a/certbot/certbot/achallenges.py b/certbot/src/certbot/achallenges.py similarity index 100% rename from certbot/certbot/achallenges.py rename to certbot/src/certbot/achallenges.py diff --git a/certbot/certbot/compat/__init__.py b/certbot/src/certbot/compat/__init__.py similarity index 100% rename from certbot/certbot/compat/__init__.py rename to certbot/src/certbot/compat/__init__.py diff --git a/certbot/certbot/compat/_path.py b/certbot/src/certbot/compat/_path.py similarity index 100% rename from certbot/certbot/compat/_path.py rename to certbot/src/certbot/compat/_path.py diff --git a/certbot/certbot/compat/filesystem.py b/certbot/src/certbot/compat/filesystem.py similarity index 100% rename from certbot/certbot/compat/filesystem.py rename to certbot/src/certbot/compat/filesystem.py diff --git a/certbot/certbot/compat/misc.py b/certbot/src/certbot/compat/misc.py similarity index 100% rename from certbot/certbot/compat/misc.py rename to certbot/src/certbot/compat/misc.py diff --git a/certbot/certbot/compat/os.py b/certbot/src/certbot/compat/os.py similarity index 100% rename from certbot/certbot/compat/os.py rename to certbot/src/certbot/compat/os.py diff --git a/certbot/certbot/configuration.py b/certbot/src/certbot/configuration.py similarity index 100% rename from certbot/certbot/configuration.py rename to certbot/src/certbot/configuration.py diff --git a/certbot/certbot/crypto_util.py b/certbot/src/certbot/crypto_util.py similarity index 100% rename from certbot/certbot/crypto_util.py rename to certbot/src/certbot/crypto_util.py diff --git a/certbot/certbot/display/__init__.py b/certbot/src/certbot/display/__init__.py similarity index 100% rename from certbot/certbot/display/__init__.py rename to certbot/src/certbot/display/__init__.py diff --git a/certbot/certbot/display/ops.py b/certbot/src/certbot/display/ops.py similarity index 100% rename from certbot/certbot/display/ops.py rename to certbot/src/certbot/display/ops.py diff --git a/certbot/certbot/display/util.py b/certbot/src/certbot/display/util.py similarity index 100% rename from certbot/certbot/display/util.py rename to certbot/src/certbot/display/util.py diff --git a/certbot/certbot/errors.py b/certbot/src/certbot/errors.py similarity index 100% rename from certbot/certbot/errors.py rename to certbot/src/certbot/errors.py diff --git a/certbot/certbot/interfaces.py b/certbot/src/certbot/interfaces.py similarity index 100% rename from certbot/certbot/interfaces.py rename to certbot/src/certbot/interfaces.py diff --git a/certbot/certbot/main.py b/certbot/src/certbot/main.py similarity index 100% rename from certbot/certbot/main.py rename to certbot/src/certbot/main.py diff --git a/certbot/certbot/ocsp.py b/certbot/src/certbot/ocsp.py similarity index 100% rename from certbot/certbot/ocsp.py rename to certbot/src/certbot/ocsp.py diff --git a/certbot/certbot/plugins/__init__.py b/certbot/src/certbot/plugins/__init__.py similarity index 100% rename from certbot/certbot/plugins/__init__.py rename to certbot/src/certbot/plugins/__init__.py diff --git a/certbot/certbot/plugins/common.py b/certbot/src/certbot/plugins/common.py similarity index 100% rename from certbot/certbot/plugins/common.py rename to certbot/src/certbot/plugins/common.py diff --git a/certbot/certbot/plugins/dns_common.py b/certbot/src/certbot/plugins/dns_common.py similarity index 100% rename from certbot/certbot/plugins/dns_common.py rename to certbot/src/certbot/plugins/dns_common.py diff --git a/certbot/certbot/plugins/dns_common_lexicon.py b/certbot/src/certbot/plugins/dns_common_lexicon.py similarity index 100% rename from certbot/certbot/plugins/dns_common_lexicon.py rename to certbot/src/certbot/plugins/dns_common_lexicon.py diff --git a/certbot/certbot/plugins/dns_test_common.py b/certbot/src/certbot/plugins/dns_test_common.py similarity index 100% rename from certbot/certbot/plugins/dns_test_common.py rename to certbot/src/certbot/plugins/dns_test_common.py diff --git a/certbot/certbot/plugins/dns_test_common_lexicon.py b/certbot/src/certbot/plugins/dns_test_common_lexicon.py similarity index 100% rename from certbot/certbot/plugins/dns_test_common_lexicon.py rename to certbot/src/certbot/plugins/dns_test_common_lexicon.py diff --git a/certbot/certbot/plugins/enhancements.py b/certbot/src/certbot/plugins/enhancements.py similarity index 100% rename from certbot/certbot/plugins/enhancements.py rename to certbot/src/certbot/plugins/enhancements.py diff --git a/certbot/certbot/plugins/storage.py b/certbot/src/certbot/plugins/storage.py similarity index 100% rename from certbot/certbot/plugins/storage.py rename to certbot/src/certbot/plugins/storage.py diff --git a/certbot/certbot/plugins/util.py b/certbot/src/certbot/plugins/util.py similarity index 100% rename from certbot/certbot/plugins/util.py rename to certbot/src/certbot/plugins/util.py diff --git a/certbot/certbot/py.typed b/certbot/src/certbot/py.typed similarity index 100% rename from certbot/certbot/py.typed rename to certbot/src/certbot/py.typed diff --git a/certbot/certbot/reverter.py b/certbot/src/certbot/reverter.py similarity index 100% rename from certbot/certbot/reverter.py rename to certbot/src/certbot/reverter.py diff --git a/certbot/certbot/ssl-dhparams.pem b/certbot/src/certbot/ssl-dhparams.pem similarity index 100% rename from certbot/certbot/ssl-dhparams.pem rename to certbot/src/certbot/ssl-dhparams.pem diff --git a/certbot/certbot/tests/__init__.py b/certbot/src/certbot/tests/__init__.py similarity index 100% rename from certbot/certbot/tests/__init__.py rename to certbot/src/certbot/tests/__init__.py diff --git a/certbot/certbot/tests/acme_util.py b/certbot/src/certbot/tests/acme_util.py similarity index 100% rename from certbot/certbot/tests/acme_util.py rename to certbot/src/certbot/tests/acme_util.py diff --git a/certbot/certbot/tests/testdata/README b/certbot/src/certbot/tests/testdata/README similarity index 100% rename from certbot/certbot/tests/testdata/README rename to certbot/src/certbot/tests/testdata/README diff --git a/certbot/certbot/tests/testdata/cert-5sans_512.pem b/certbot/src/certbot/tests/testdata/cert-5sans_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert-5sans_512.pem rename to certbot/src/certbot/tests/testdata/cert-5sans_512.pem diff --git a/certbot/certbot/tests/testdata/cert-nosans_nistp256.pem b/certbot/src/certbot/tests/testdata/cert-nosans_nistp256.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert-nosans_nistp256.pem rename to certbot/src/certbot/tests/testdata/cert-nosans_nistp256.pem diff --git a/certbot/certbot/tests/testdata/cert-san_512.pem b/certbot/src/certbot/tests/testdata/cert-san_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert-san_512.pem rename to certbot/src/certbot/tests/testdata/cert-san_512.pem diff --git a/certbot/certbot/tests/testdata/cert_2048.pem b/certbot/src/certbot/tests/testdata/cert_2048.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_2048.pem rename to certbot/src/certbot/tests/testdata/cert_2048.pem diff --git a/certbot/certbot/tests/testdata/cert_512.pem b/certbot/src/certbot/tests/testdata/cert_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_512.pem rename to certbot/src/certbot/tests/testdata/cert_512.pem diff --git a/certbot/certbot/tests/testdata/cert_512_bad.pem b/certbot/src/certbot/tests/testdata/cert_512_bad.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_512_bad.pem rename to certbot/src/certbot/tests/testdata/cert_512_bad.pem diff --git a/certbot/certbot/tests/testdata/cert_fullchain_2048.pem b/certbot/src/certbot/tests/testdata/cert_fullchain_2048.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_fullchain_2048.pem rename to certbot/src/certbot/tests/testdata/cert_fullchain_2048.pem diff --git a/certbot/certbot/tests/testdata/cert_intermediate_1.pem b/certbot/src/certbot/tests/testdata/cert_intermediate_1.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_intermediate_1.pem rename to certbot/src/certbot/tests/testdata/cert_intermediate_1.pem diff --git a/certbot/certbot/tests/testdata/cert_intermediate_2.pem b/certbot/src/certbot/tests/testdata/cert_intermediate_2.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_intermediate_2.pem rename to certbot/src/certbot/tests/testdata/cert_intermediate_2.pem diff --git a/certbot/certbot/tests/testdata/cert_leaf.pem b/certbot/src/certbot/tests/testdata/cert_leaf.pem similarity index 100% rename from certbot/certbot/tests/testdata/cert_leaf.pem rename to certbot/src/certbot/tests/testdata/cert_leaf.pem diff --git a/certbot/certbot/tests/testdata/cli.ini b/certbot/src/certbot/tests/testdata/cli.ini similarity index 100% rename from certbot/certbot/tests/testdata/cli.ini rename to certbot/src/certbot/tests/testdata/cli.ini diff --git a/certbot/certbot/tests/testdata/csr-6sans_512.conf b/certbot/src/certbot/tests/testdata/csr-6sans_512.conf similarity index 100% rename from certbot/certbot/tests/testdata/csr-6sans_512.conf rename to certbot/src/certbot/tests/testdata/csr-6sans_512.conf diff --git a/certbot/certbot/tests/testdata/csr-6sans_512.pem b/certbot/src/certbot/tests/testdata/csr-6sans_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/csr-6sans_512.pem rename to certbot/src/certbot/tests/testdata/csr-6sans_512.pem diff --git a/certbot/certbot/tests/testdata/csr-nonames_512.pem b/certbot/src/certbot/tests/testdata/csr-nonames_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/csr-nonames_512.pem rename to certbot/src/certbot/tests/testdata/csr-nonames_512.pem diff --git a/certbot/certbot/tests/testdata/csr-nosans_512.conf b/certbot/src/certbot/tests/testdata/csr-nosans_512.conf similarity index 100% rename from certbot/certbot/tests/testdata/csr-nosans_512.conf rename to certbot/src/certbot/tests/testdata/csr-nosans_512.conf diff --git a/certbot/certbot/tests/testdata/csr-nosans_512.pem b/certbot/src/certbot/tests/testdata/csr-nosans_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/csr-nosans_512.pem rename to certbot/src/certbot/tests/testdata/csr-nosans_512.pem diff --git a/certbot/certbot/tests/testdata/csr-nosans_nistp256.pem b/certbot/src/certbot/tests/testdata/csr-nosans_nistp256.pem similarity index 100% rename from certbot/certbot/tests/testdata/csr-nosans_nistp256.pem rename to certbot/src/certbot/tests/testdata/csr-nosans_nistp256.pem diff --git a/certbot/certbot/tests/testdata/csr-san_512.pem b/certbot/src/certbot/tests/testdata/csr-san_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/csr-san_512.pem rename to certbot/src/certbot/tests/testdata/csr-san_512.pem diff --git a/certbot/certbot/tests/testdata/csr_512.der b/certbot/src/certbot/tests/testdata/csr_512.der similarity index 100% rename from certbot/certbot/tests/testdata/csr_512.der rename to certbot/src/certbot/tests/testdata/csr_512.der diff --git a/certbot/certbot/tests/testdata/csr_512.pem b/certbot/src/certbot/tests/testdata/csr_512.pem similarity index 100% rename from certbot/certbot/tests/testdata/csr_512.pem rename to certbot/src/certbot/tests/testdata/csr_512.pem diff --git a/certbot/certbot/tests/testdata/ec_prime256v1_key.pem b/certbot/src/certbot/tests/testdata/ec_prime256v1_key.pem similarity index 100% rename from certbot/certbot/tests/testdata/ec_prime256v1_key.pem rename to certbot/src/certbot/tests/testdata/ec_prime256v1_key.pem diff --git a/certbot/certbot/tests/testdata/ec_secp384r1_key.pem b/certbot/src/certbot/tests/testdata/ec_secp384r1_key.pem similarity index 100% rename from certbot/certbot/tests/testdata/ec_secp384r1_key.pem rename to certbot/src/certbot/tests/testdata/ec_secp384r1_key.pem diff --git a/certbot/certbot/tests/testdata/ec_secp521r1_key.pem b/certbot/src/certbot/tests/testdata/ec_secp521r1_key.pem similarity index 100% rename from certbot/certbot/tests/testdata/ec_secp521r1_key.pem rename to certbot/src/certbot/tests/testdata/ec_secp521r1_key.pem diff --git a/certbot/certbot/tests/testdata/nistp256_key.pem b/certbot/src/certbot/tests/testdata/nistp256_key.pem similarity index 100% rename from certbot/certbot/tests/testdata/nistp256_key.pem rename to certbot/src/certbot/tests/testdata/nistp256_key.pem diff --git a/certbot/certbot/tests/testdata/ocsp_certificate.pem b/certbot/src/certbot/tests/testdata/ocsp_certificate.pem similarity index 100% rename from certbot/certbot/tests/testdata/ocsp_certificate.pem rename to certbot/src/certbot/tests/testdata/ocsp_certificate.pem diff --git a/certbot/certbot/tests/testdata/ocsp_issuer_certificate.pem b/certbot/src/certbot/tests/testdata/ocsp_issuer_certificate.pem similarity index 100% rename from certbot/certbot/tests/testdata/ocsp_issuer_certificate.pem rename to certbot/src/certbot/tests/testdata/ocsp_issuer_certificate.pem diff --git a/certbot/certbot/tests/testdata/ocsp_responder_certificate.pem b/certbot/src/certbot/tests/testdata/ocsp_responder_certificate.pem similarity index 100% rename from certbot/certbot/tests/testdata/ocsp_responder_certificate.pem rename to certbot/src/certbot/tests/testdata/ocsp_responder_certificate.pem diff --git a/certbot/certbot/tests/testdata/os-release b/certbot/src/certbot/tests/testdata/os-release similarity index 100% rename from certbot/certbot/tests/testdata/os-release rename to certbot/src/certbot/tests/testdata/os-release diff --git a/certbot/certbot/tests/testdata/rsa2048_key.pem b/certbot/src/certbot/tests/testdata/rsa2048_key.pem similarity index 100% rename from certbot/certbot/tests/testdata/rsa2048_key.pem rename to certbot/src/certbot/tests/testdata/rsa2048_key.pem diff --git a/certbot/certbot/tests/testdata/rsa512_key.pem b/certbot/src/certbot/tests/testdata/rsa512_key.pem similarity index 100% rename from certbot/certbot/tests/testdata/rsa512_key.pem rename to certbot/src/certbot/tests/testdata/rsa512_key.pem diff --git a/certbot/certbot/tests/testdata/sample-archive-ec/cert1.pem b/certbot/src/certbot/tests/testdata/sample-archive-ec/cert1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive-ec/cert1.pem rename to certbot/src/certbot/tests/testdata/sample-archive-ec/cert1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive-ec/chain1.pem b/certbot/src/certbot/tests/testdata/sample-archive-ec/chain1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive-ec/chain1.pem rename to certbot/src/certbot/tests/testdata/sample-archive-ec/chain1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive-ec/fullchain1.pem b/certbot/src/certbot/tests/testdata/sample-archive-ec/fullchain1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive-ec/fullchain1.pem rename to certbot/src/certbot/tests/testdata/sample-archive-ec/fullchain1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive-ec/privkey1.pem b/certbot/src/certbot/tests/testdata/sample-archive-ec/privkey1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive-ec/privkey1.pem rename to certbot/src/certbot/tests/testdata/sample-archive-ec/privkey1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive/cert1.pem b/certbot/src/certbot/tests/testdata/sample-archive/cert1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive/cert1.pem rename to certbot/src/certbot/tests/testdata/sample-archive/cert1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive/chain1.pem b/certbot/src/certbot/tests/testdata/sample-archive/chain1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive/chain1.pem rename to certbot/src/certbot/tests/testdata/sample-archive/chain1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive/fullchain1.pem b/certbot/src/certbot/tests/testdata/sample-archive/fullchain1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive/fullchain1.pem rename to certbot/src/certbot/tests/testdata/sample-archive/fullchain1.pem diff --git a/certbot/certbot/tests/testdata/sample-archive/privkey1.pem b/certbot/src/certbot/tests/testdata/sample-archive/privkey1.pem similarity index 100% rename from certbot/certbot/tests/testdata/sample-archive/privkey1.pem rename to certbot/src/certbot/tests/testdata/sample-archive/privkey1.pem diff --git a/certbot/certbot/tests/testdata/sample-renewal-ancient.conf b/certbot/src/certbot/tests/testdata/sample-renewal-ancient.conf similarity index 100% rename from certbot/certbot/tests/testdata/sample-renewal-ancient.conf rename to certbot/src/certbot/tests/testdata/sample-renewal-ancient.conf diff --git a/certbot/certbot/tests/testdata/sample-renewal-deprecated-option.conf b/certbot/src/certbot/tests/testdata/sample-renewal-deprecated-option.conf similarity index 100% rename from certbot/certbot/tests/testdata/sample-renewal-deprecated-option.conf rename to certbot/src/certbot/tests/testdata/sample-renewal-deprecated-option.conf diff --git a/certbot/certbot/tests/testdata/sample-renewal-ec.conf b/certbot/src/certbot/tests/testdata/sample-renewal-ec.conf similarity index 100% rename from certbot/certbot/tests/testdata/sample-renewal-ec.conf rename to certbot/src/certbot/tests/testdata/sample-renewal-ec.conf diff --git a/certbot/certbot/tests/testdata/sample-renewal.conf b/certbot/src/certbot/tests/testdata/sample-renewal.conf similarity index 100% rename from certbot/certbot/tests/testdata/sample-renewal.conf rename to certbot/src/certbot/tests/testdata/sample-renewal.conf diff --git a/certbot/certbot/tests/testdata/webrootconftest.ini b/certbot/src/certbot/tests/testdata/webrootconftest.ini similarity index 100% rename from certbot/certbot/tests/testdata/webrootconftest.ini rename to certbot/src/certbot/tests/testdata/webrootconftest.ini diff --git a/certbot/certbot/tests/util.py b/certbot/src/certbot/tests/util.py similarity index 100% rename from certbot/certbot/tests/util.py rename to certbot/src/certbot/tests/util.py diff --git a/certbot/certbot/util.py b/certbot/src/certbot/util.py similarity index 100% rename from certbot/certbot/util.py rename to certbot/src/certbot/util.py diff --git a/letstest/scripts/version.py b/letstest/scripts/version.py index dd8f1e3f3..c5debd689 100755 --- a/letstest/scripts/version.py +++ b/letstest/scripts/version.py @@ -17,6 +17,7 @@ def certbot_version(letstest_scripts_dir): return re.search('''^__version__ = ['"](.+)['"].*''', file_contents(join(dirname(dirname(letstest_scripts_dir)), 'certbot', + 'src', 'certbot', '__init__.py')), re.M).group(1) diff --git a/linter_plugin.py b/linter_plugin.py index 1c469d054..c48640a33 100644 --- a/linter_plugin.py +++ b/linter_plugin.py @@ -12,8 +12,8 @@ import re from pylint.checkers import BaseChecker # Modules whose file is matching one of these paths can import the os module. -WHITELIST_PATHS = [ - '/acme/acme/', +ALLOWLIST_PATHS = [ + '/acme/src/acme/', '/certbot-ci/', '/certbot-compatibility-test/', ] @@ -53,5 +53,5 @@ def register(linter): def _check_disabled(node): module = node.root() - return any(path for path in WHITELIST_PATHS + return any(path for path in ALLOWLIST_PATHS if os.path.normpath(path) in os.path.normpath(module.file)) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d2793865c..2cf88a5fa 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -117,7 +117,7 @@ parts: override-pull: | craftctl default grep -v python-augeas "${CRAFT_PART_SRC}/tools/requirements.txt" >> "${CRAFT_PART_SRC}/snap-constraints.txt" - craftctl set version=$(grep -oP "__version__ = '\K.*(?=')" "${CRAFT_PART_SRC}/certbot/certbot/__init__.py") + craftctl set version=$(grep -oP "__version__ = '\K.*(?=')" "${CRAFT_PART_SRC}/certbot/src/certbot/__init__.py") build-attributes: - enable-patchelf shared-metadata: @@ -126,7 +126,7 @@ parts: override-pull: | craftctl default mkdir -p certbot-metadata - grep -oP "__version__ = '\K.*(?=')" $CRAFT_PART_SRC/certbot/certbot/__init__.py > certbot-metadata/certbot-version.txt + grep -oP "__version__ = '\K.*(?=')" $CRAFT_PART_SRC/certbot/src/certbot/__init__.py > certbot-metadata/certbot-version.txt stage: [certbot-metadata/certbot-version.txt] plugs: diff --git a/tools/_release.sh b/tools/_release.sh index 1574b9d79..bae1ef5bd 100755 --- a/tools/_release.sh +++ b/tools/_release.sh @@ -119,7 +119,7 @@ SetVersion() { fi sed -i "s/^version.*/version = '$ver'/" $pkg_dir/setup.py done - init_file="certbot/certbot/__init__.py" + init_file="certbot/src/certbot/__init__.py" if [ $(grep -c '^__version' "$init_file") != 1 ]; then echo "Unexpected count of __version variables in $init_file" exit 1 diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index 5f880f0ac..21609ed00 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -1,96 +1,96 @@ # This file was generated by tools/pinning/oldest/repin.sh and can be updated using # that script. -apacheconfig==0.3.2 ; python_version >= "3.9" and python_version < "3.10" -asn1crypto==0.24.0 ; python_version >= "3.9" and python_version < "3.10" -astroid==3.3.9 ; python_version >= "3.9" and python_version < "3.10" -attrs==25.3.0 ; python_version >= "3.9" and python_version < "3.10" -beautifulsoup4==4.13.3 ; python_version >= "3.9" and python_version < "3.10" -boto3==1.15.15 ; python_version >= "3.9" and python_version < "3.10" -botocore==1.18.15 ; python_version >= "3.9" and python_version < "3.10" -cachetools==5.5.2 ; python_version >= "3.9" and python_version < "3.10" -certifi==2025.1.31 ; python_version >= "3.9" and python_version < "3.10" -cffi==1.12.3 ; python_version >= "3.9" and python_version < "3.10" -chardet==3.0.4 ; python_version >= "3.9" and python_version < "3.10" -cloudflare==2.19.0 ; python_version >= "3.9" and python_version < "3.10" -colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.10" and sys_platform == "win32" -configargparse==1.5.3 ; python_version >= "3.9" and python_version < "3.10" -configobj==5.0.6 ; python_version >= "3.9" and python_version < "3.10" -coverage==7.8.0 ; python_version >= "3.9" and python_version < "3.10" -cryptography==43.0.0 ; python_version >= "3.9" and python_version < "3.10" -cython==0.29.37 ; python_version >= "3.9" and python_version < "3.10" -dill==0.3.9 ; python_version >= "3.9" and python_version < "3.10" -distlib==0.3.9 ; python_version >= "3.9" and python_version < "3.10" -distro==1.0.1 ; python_version >= "3.9" and python_version < "3.10" -dns-lexicon==3.15.1 ; python_version >= "3.9" and python_version < "3.10" -dnspython==2.6.1 ; python_version >= "3.9" and python_version < "3.10" -exceptiongroup==1.2.2 ; python_version >= "3.9" and python_version < "3.10" -execnet==2.1.1 ; python_version >= "3.9" and python_version < "3.10" -filelock==3.18.0 ; python_version >= "3.9" and python_version < "3.10" -funcsigs==0.4 ; python_version >= "3.9" and python_version < "3.10" -future==1.0.0 ; python_version >= "3.9" and python_version < "3.10" -google-api-python-client==1.6.5 ; python_version >= "3.9" and python_version < "3.10" -google-auth==2.16.0 ; python_version >= "3.9" and python_version < "3.10" -httplib2==0.9.2 ; python_version >= "3.9" and python_version < "3.10" -idna==2.6 ; python_version >= "3.9" and python_version < "3.10" -importlib-metadata==4.6.4 ; python_version >= "3.9" and python_version < "3.10" -iniconfig==2.1.0 ; python_version >= "3.9" and python_version < "3.10" -ipaddress==1.0.16 ; python_version >= "3.9" and python_version < "3.10" -isort==6.0.1 ; python_version >= "3.9" and python_version < "3.10" -jmespath==0.10.0 ; python_version >= "3.9" and python_version < "3.10" -josepy==2.0.0 ; python_version >= "3.9" and python_version < "3.10" -jsonlines==4.0.0 ; python_version >= "3.9" and python_version < "3.10" -mccabe==0.7.0 ; python_version >= "3.9" and python_version < "3.10" -mypy-extensions==1.0.0 ; python_version >= "3.9" and python_version < "3.10" -mypy==1.15.0 ; python_version >= "3.9" and python_version < "3.10" -ndg-httpsclient==0.3.2 ; python_version >= "3.9" and python_version < "3.10" -oauth2client==4.1.3 ; python_version >= "3.9" and python_version < "3.10" -packaging==24.2 ; python_version >= "3.9" and python_version < "3.10" -parsedatetime==2.4 ; python_version >= "3.9" and python_version < "3.10" -pbr==1.8.0 ; python_version >= "3.9" and python_version < "3.10" -pip==25.0.1 ; python_version >= "3.9" and python_version < "3.10" -platformdirs==4.3.7 ; python_version >= "3.9" and python_version < "3.10" -pluggy==1.5.0 ; python_version >= "3.9" and python_version < "3.10" -ply==3.4 ; python_version >= "3.9" and python_version < "3.10" -py==1.11.0 ; python_version >= "3.9" and python_version < "3.10" -pyasn1-modules==0.4.1 ; python_version >= "3.9" and python_version < "3.10" -pyasn1==0.4.8 ; python_version >= "3.9" and python_version < "3.10" -pycparser==2.14 ; python_version >= "3.9" and python_version < "3.10" -pylint==3.3.6 ; python_version >= "3.9" and python_version < "3.10" -pyopenssl==25.0.0 ; python_version >= "3.9" and python_version < "3.10" -pyotp==2.9.0 ; python_version >= "3.9" and python_version < "3.10" -pyparsing==2.4.7 ; python_version >= "3.9" and python_version < "3.10" -pyrfc3339==1.0 ; python_version >= "3.9" and python_version < "3.10" -pytest-cov==6.1.0 ; python_version >= "3.9" and python_version < "3.10" -pytest-xdist==3.6.1 ; python_version >= "3.9" and python_version < "3.10" -pytest==8.3.5 ; python_version >= "3.9" and python_version < "3.10" -python-augeas==0.5.0 ; python_version >= "3.9" and python_version < "3.10" -python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_version < "3.10" -python-digitalocean==1.11 ; python_version >= "3.9" and python_version < "3.10" -pytz==2019.3 ; python_version >= "3.9" and python_version < "3.10" -pywin32==310 ; python_version >= "3.9" and python_version < "3.10" and sys_platform == "win32" -pyyaml==6.0.2 ; python_version >= "3.9" and python_version < "3.10" -requests-file==2.1.0 ; python_version >= "3.9" and python_version < "3.10" -requests==2.20.0 ; python_version >= "3.9" and python_version < "3.10" -rsa==4.9 ; python_version >= "3.9" and python_version < "3.10" -s3transfer==0.3.7 ; python_version >= "3.9" and python_version < "3.10" -setuptools==78.1.0 ; python_version >= "3.9" and python_version < "3.10" -six==1.11.0 ; python_version >= "3.9" and python_version < "3.10" -soupsieve==2.6 ; python_version >= "3.9" and python_version < "3.10" -tldextract==5.1.3 ; python_version >= "3.9" and python_version < "3.10" -tomli==2.2.1 ; python_version >= "3.9" and python_version < "3.10" -tomlkit==0.13.2 ; python_version >= "3.9" and python_version < "3.10" -tox==1.9.2 ; python_version >= "3.9" and python_version < "3.10" -types-httplib2==0.22.0.20250401 ; python_version >= "3.9" and python_version < "3.10" -types-pyrfc3339==2.0.1.20241107 ; python_version >= "3.9" and python_version < "3.10" -types-python-dateutil==2.9.0.20241206 ; python_version >= "3.9" and python_version < "3.10" -types-pytz==2025.2.0.20250326 ; python_version >= "3.9" and python_version < "3.10" -types-pywin32==310.0.0.20250319 ; python_version >= "3.9" and python_version < "3.10" -types-requests==2.31.0.6 ; python_version >= "3.9" and python_version < "3.10" -types-setuptools==78.1.0.20250329 ; python_version >= "3.9" and python_version < "3.10" -types-urllib3==1.26.25.14 ; python_version >= "3.9" and python_version < "3.10" -typing-extensions==4.13.0 ; python_version >= "3.9" and python_version < "3.10" -uritemplate==3.0.1 ; python_version >= "3.9" and python_version < "3.10" -urllib3==1.24.2 ; python_version >= "3.9" and python_version < "3.10" -virtualenv==20.30.0 ; python_version >= "3.9" and python_version < "3.10" -wheel==0.45.1 ; python_version >= "3.9" and python_version < "3.10" -zipp==3.21.0 ; python_version >= "3.9" and python_version < "3.10" +apacheconfig==0.3.2 ; python_version == "3.9" +asn1crypto==0.24.0 ; python_version == "3.9" +astroid==3.3.9 ; python_version == "3.9" +attrs==25.3.0 ; python_version == "3.9" +beautifulsoup4==4.13.3 ; python_version == "3.9" +boto3==1.15.15 ; python_version == "3.9" +botocore==1.18.15 ; python_version == "3.9" +cachetools==5.5.2 ; python_version == "3.9" +certifi==2025.1.31 ; python_version == "3.9" +cffi==1.12.3 ; python_version == "3.9" +chardet==3.0.4 ; python_version == "3.9" +cloudflare==2.19.0 ; python_version == "3.9" +colorama==0.4.6 ; python_version == "3.9" and sys_platform == "win32" +configargparse==1.5.3 ; python_version == "3.9" +configobj==5.0.6 ; python_version == "3.9" +coverage==7.8.0 ; python_version == "3.9" +cryptography==43.0.0 ; python_version == "3.9" +cython==0.29.37 ; python_version == "3.9" +dill==0.3.9 ; python_version == "3.9" +distlib==0.3.9 ; python_version == "3.9" +distro==1.0.1 ; python_version == "3.9" +dns-lexicon==3.15.1 ; python_version == "3.9" +dnspython==2.6.1 ; python_version == "3.9" +exceptiongroup==1.2.2 ; python_version == "3.9" +execnet==2.1.1 ; python_version == "3.9" +filelock==3.18.0 ; python_version == "3.9" +funcsigs==0.4 ; python_version == "3.9" +future==1.0.0 ; python_version == "3.9" +google-api-python-client==1.6.5 ; python_version == "3.9" +google-auth==2.16.0 ; python_version == "3.9" +httplib2==0.9.2 ; python_version == "3.9" +idna==2.6 ; python_version == "3.9" +importlib-metadata==8.6.1 ; python_version == "3.9" +iniconfig==2.1.0 ; python_version == "3.9" +ipaddress==1.0.16 ; python_version == "3.9" +isort==6.0.1 ; python_version == "3.9" +jmespath==0.10.0 ; python_version == "3.9" +josepy==2.0.0 ; python_version == "3.9" +jsonlines==4.0.0 ; python_version == "3.9" +mccabe==0.7.0 ; python_version == "3.9" +mypy-extensions==1.0.0 ; python_version == "3.9" +mypy==1.15.0 ; python_version == "3.9" +ndg-httpsclient==0.3.2 ; python_version == "3.9" +oauth2client==4.1.3 ; python_version == "3.9" +packaging==24.2 ; python_version == "3.9" +parsedatetime==2.4 ; python_version == "3.9" +pbr==1.8.0 ; python_version == "3.9" +pip==25.0.1 ; python_version == "3.9" +platformdirs==4.3.7 ; python_version == "3.9" +pluggy==1.5.0 ; python_version == "3.9" +ply==3.4 ; python_version == "3.9" +py==1.11.0 ; python_version == "3.9" +pyasn1-modules==0.4.1 ; python_version == "3.9" +pyasn1==0.4.8 ; python_version == "3.9" +pycparser==2.14 ; python_version == "3.9" +pylint==3.3.6 ; python_version == "3.9" +pyopenssl==25.0.0 ; python_version == "3.9" +pyotp==2.9.0 ; python_version == "3.9" +pyparsing==2.4.7 ; python_version == "3.9" +pyrfc3339==1.0 ; python_version == "3.9" +pytest-cov==6.1.1 ; python_version == "3.9" +pytest-xdist==3.6.1 ; python_version == "3.9" +pytest==8.3.5 ; python_version == "3.9" +python-augeas==0.5.0 ; python_version == "3.9" +python-dateutil==2.9.0.post0 ; python_version == "3.9" +python-digitalocean==1.11 ; python_version == "3.9" +pytz==2019.3 ; python_version == "3.9" +pywin32==310 ; python_version == "3.9" and sys_platform == "win32" +pyyaml==6.0.2 ; python_version == "3.9" +requests-file==2.1.0 ; python_version == "3.9" +requests==2.20.0 ; python_version == "3.9" +rsa==4.9 ; python_version == "3.9" +s3transfer==0.3.7 ; python_version == "3.9" +setuptools==78.1.0 ; python_version == "3.9" +six==1.11.0 ; python_version == "3.9" +soupsieve==2.6 ; python_version == "3.9" +tldextract==5.2.0 ; python_version == "3.9" +tomli==2.2.1 ; python_version == "3.9" +tomlkit==0.13.2 ; python_version == "3.9" +tox==1.9.2 ; python_version == "3.9" +types-httplib2==0.22.0.20250401 ; python_version == "3.9" +types-pyrfc3339==2.0.1.20241107 ; python_version == "3.9" +types-python-dateutil==2.9.0.20241206 ; python_version == "3.9" +types-pytz==2025.2.0.20250326 ; python_version == "3.9" +types-pywin32==310.0.0.20250319 ; python_version == "3.9" +types-requests==2.31.0.6 ; python_version == "3.9" +types-setuptools==78.1.0.20250329 ; python_version == "3.9" +types-urllib3==1.26.25.14 ; python_version == "3.9" +typing-extensions==4.13.2 ; python_version == "3.9" +uritemplate==3.0.1 ; python_version == "3.9" +urllib3==1.24.2 ; python_version == "3.9" +virtualenv==20.30.0 ; python_version == "3.9" +wheel==0.45.1 ; python_version == "3.9" +zipp==3.21.0 ; python_version == "3.9" diff --git a/tools/pinning/oldest/pyproject.toml b/tools/pinning/oldest/pyproject.toml index 142ba4881..7c6664767 100644 --- a/tools/pinning/oldest/pyproject.toml +++ b/tools/pinning/oldest/pyproject.toml @@ -69,7 +69,6 @@ google-api-python-client = "1.6.5" google-auth = "2.16.0" httplib2 = "0.9.2" idna = "2.6" -importlib-metadata = "4.6.4" ipaddress = "1.0.16" ndg-httpsclient = "0.3.2" parsedatetime = "2.4" diff --git a/tools/pip_install.py b/tools/pip_install.py index 03c771438..ebec4baef 100755 --- a/tools/pip_install.py +++ b/tools/pip_install.py @@ -29,7 +29,7 @@ def call_with_print(command, env): def pip_install_with_print(args_str, env): - command = ['"', sys.executable, '" -m pip install --disable-pip-version-check ', args_str] + command = ['"', sys.executable, '" -m pip install --disable-pip-version-check --use-pep517 ', args_str] call_with_print(''.join(command), env=env) diff --git a/tools/requirements.txt b/tools/requirements.txt index bfaf276d1..068d02258 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -5,20 +5,21 @@ # requirements.txt so that is scanned by GitHub. See # https://docs.github.com/en/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems # for more info. -alabaster==0.7.16 ; python_version >= "3.9" and python_version < "4.0" +alabaster==0.7.16 ; python_version == "3.9" +alabaster==1.0.0 ; python_version >= "3.10" and python_version < "4.0" anyio==4.9.0 ; python_version >= "3.9" and python_version < "4.0" apacheconfig==0.3.2 ; python_version >= "3.9" and python_version < "4.0" astroid==3.3.9 ; python_version >= "3.9" and python_version < "4.0" asttokens==3.0.0 ; python_version >= "3.9" and python_version < "4.0" attrs==25.3.0 ; python_version >= "3.9" and python_version < "4.0" -azure-core==1.32.0 ; python_version >= "3.9" and python_version < "4.0" +azure-core==1.33.0 ; python_version >= "3.9" and python_version < "4.0" azure-devops==7.1.0b4 ; python_version >= "3.9" and python_version < "4.0" babel==2.17.0 ; python_version >= "3.9" and python_version < "4.0" -backports-tarfile==1.2.0 ; python_version >= "3.9" and python_version < "3.12" +backports-tarfile==1.2.0 ; python_version >= "3.9" and python_version <= "3.11" bcrypt==4.3.0 ; python_version >= "3.9" and python_version < "4.0" beautifulsoup4==4.13.3 ; python_version >= "3.9" and python_version < "4.0" -boto3==1.37.25 ; python_version >= "3.9" and python_version < "4.0" -botocore==1.37.25 ; python_version >= "3.9" and python_version < "4.0" +boto3==1.37.32 ; python_version >= "3.9" and python_version < "4.0" +botocore==1.37.32 ; python_version >= "3.9" and python_version < "4.0" build==1.2.2.post1 ; python_version >= "3.9" and python_version < "4.0" cachecontrol==0.14.2 ; python_version >= "3.9" and python_version < "4.0" cachetools==5.5.2 ; python_version >= "3.9" and python_version < "4.0" @@ -33,14 +34,15 @@ configargparse==1.7 ; python_version >= "3.9" and python_version < "4.0" configobj==5.0.9 ; python_version >= "3.9" and python_version < "4.0" coverage==7.8.0 ; python_version >= "3.9" and python_version < "4.0" crashtest==0.4.1 ; python_version >= "3.9" and python_version < "4.0" -cryptography==43.0.3 ; python_version >= "3.9" and python_version < "4.0" +cryptography==43.0.3 ; python_version == "3.9" +cryptography==44.0.2 ; python_version >= "3.10" and python_version < "4.0" cython==0.29.37 ; python_version >= "3.9" and python_version < "4.0" decorator==5.2.1 ; python_version >= "3.9" and python_version < "4.0" deprecated==1.2.18 ; python_version >= "3.9" and python_version < "4.0" dill==0.3.9 ; python_version >= "3.9" and python_version < "4.0" distlib==0.3.9 ; python_version >= "3.9" and python_version < "4.0" distro==1.9.0 ; python_version >= "3.9" and python_version < "4.0" -dns-lexicon==3.20.1 ; python_version >= "3.9" and python_version < "4.0" +dns-lexicon==3.21.0 ; python_version >= "3.9" and python_version < "4.0" dnspython==2.7.0 ; python_version >= "3.9" and python_version < "4.0" docutils==0.21.2 ; python_version >= "3.9" and python_version < "4.0" dulwich==0.22.8 ; python_version >= "3.9" and python_version < "4.0" @@ -63,12 +65,15 @@ httpx==0.28.1 ; python_version >= "3.9" and python_version < "4.0" id==1.5.0 ; python_version >= "3.9" and python_version < "4.0" idna==3.10 ; python_version >= "3.9" and python_version < "4.0" imagesize==1.4.1 ; python_version >= "3.9" and python_version < "4.0" -importlib-metadata==8.6.1 ; python_version >= "3.9" and python_version < "3.12" +importlib-metadata==8.6.1 ; python_version >= "3.9" and python_version <= "3.11" iniconfig==2.1.0 ; python_version >= "3.9" and python_version < "4.0" installer==0.7.0 ; python_version >= "3.9" and python_version < "4.0" invoke==2.2.0 ; python_version >= "3.9" and python_version < "4.0" ipdb==0.13.13 ; python_version >= "3.9" and python_version < "4.0" -ipython==8.18.1 ; python_version >= "3.9" and python_version < "4.0" +ipython-pygments-lexers==1.1.1 ; python_version >= "3.11" and python_version < "4.0" +ipython==8.18.1 ; python_version == "3.9" +ipython==8.35.0 ; python_version == "3.10" +ipython==9.1.0 ; python_version >= "3.11" and python_version < "4.0" isodate==0.7.2 ; python_version >= "3.9" and python_version < "4.0" isort==5.13.2 ; python_version >= "3.9" and python_version < "4.0" jaraco-classes==3.4.0 ; python_version >= "3.9" and python_version < "4.0" @@ -98,8 +103,8 @@ packaging==24.2 ; python_version >= "3.9" and python_version < "4.0" paramiko==3.5.1 ; python_version >= "3.9" and python_version < "4.0" parsedatetime==2.6 ; python_version >= "3.9" and python_version < "4.0" parso==0.8.4 ; python_version >= "3.9" and python_version < "4.0" -pbs-installer==2025.3.17 ; python_version >= "3.9" and python_version < "4.0" -pexpect==4.9.0 ; python_version >= "3.9" and python_version < "4.0" and sys_platform != "win32" +pbs-installer==2025.4.9 ; python_version >= "3.9" and python_version < "4.0" +pexpect==4.9.0 ; python_version >= "3.9" and python_version < "4.0" and sys_platform != "win32" and sys_platform != "emscripten" or python_version == "3.9" and sys_platform != "win32" pip==25.0.1 ; python_version >= "3.9" and python_version < "4.0" pkginfo==1.12.1.2 ; python_version >= "3.9" and python_version < "4.0" platformdirs==4.3.7 ; python_version >= "3.9" and python_version < "4.0" @@ -111,7 +116,7 @@ poetry==2.1.2 ; python_version >= "3.9" and python_version < "4.0" prompt-toolkit==3.0.50 ; python_version >= "3.9" and python_version < "4.0" proto-plus==1.26.1 ; python_version >= "3.9" and python_version < "4.0" protobuf==6.30.2 ; python_version >= "3.9" and python_version < "4.0" -ptyprocess==0.7.0 ; python_version >= "3.9" and python_version < "4.0" and sys_platform != "win32" +ptyprocess==0.7.0 ; python_version >= "3.9" and python_version < "4.0" and sys_platform != "win32" and sys_platform != "emscripten" or python_version == "3.9" and sys_platform != "win32" pure-eval==0.2.3 ; python_version >= "3.9" and python_version < "4.0" pyasn1-modules==0.4.2 ; python_version >= "3.9" and python_version < "4.0" pyasn1==0.6.1 ; python_version >= "3.9" and python_version < "4.0" @@ -125,7 +130,7 @@ pyparsing==3.2.3 ; python_version >= "3.9" and python_version < "4.0" pyproject-api==1.9.0 ; python_version >= "3.9" and python_version < "4.0" pyproject-hooks==1.2.0 ; python_version >= "3.9" and python_version < "4.0" pyrfc3339==2.0.1 ; python_version >= "3.9" and python_version < "4.0" -pytest-cov==6.1.0 ; python_version >= "3.9" and python_version < "4.0" +pytest-cov==6.1.1 ; python_version >= "3.9" and python_version < "4.0" pytest-xdist==3.6.1 ; python_version >= "3.9" and python_version < "4.0" pytest==8.3.5 ; python_version >= "3.9" and python_version < "4.0" python-augeas==1.1.0 ; python_version >= "3.9" and python_version < "4.0" @@ -135,7 +140,7 @@ pytz==2025.2 ; python_version >= "3.9" and python_version < "4.0" pywin32-ctypes==0.2.3 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32" pywin32==310 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32" pyyaml==6.0.2 ; python_version >= "3.9" and python_version < "4.0" -rapidfuzz==3.12.2 ; python_version >= "3.9" and python_version < "4.0" +rapidfuzz==3.13.0 ; python_version >= "3.9" and python_version < "4.0" readme-renderer==44.0 ; python_version >= "3.9" and python_version < "4.0" requests-file==2.1.0 ; python_version >= "3.9" and python_version < "4.0" requests-oauthlib==2.0.0 ; python_version >= "3.9" and python_version < "4.0" @@ -143,11 +148,12 @@ requests-toolbelt==1.0.0 ; python_version >= "3.9" and python_version < "4.0" requests==2.32.3 ; python_version >= "3.9" and python_version < "4.0" rfc3986==2.0.0 ; python_version >= "3.9" and python_version < "4.0" rich==14.0.0 ; python_version >= "3.9" and python_version < "4.0" +roman-numerals-py==3.1.0 ; python_version >= "3.11" and python_version < "4.0" rsa==4.9 ; python_version >= "3.9" and python_version < "4.0" s3transfer==0.11.4 ; python_version >= "3.9" and python_version < "4.0" secretstorage==3.3.3 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "linux" semantic-version==2.10.0 ; python_version >= "3.9" and python_version < "4.0" -setuptools-rust==1.11.0 ; python_version >= "3.9" and python_version < "4.0" +setuptools-rust==1.11.1 ; python_version >= "3.9" and python_version < "4.0" setuptools==78.1.0 ; python_version >= "3.9" and python_version < "4.0" shellingham==1.5.4 ; python_version >= "3.9" and python_version < "4.0" six==1.17.0 ; python_version >= "3.9" and python_version < "4.0" @@ -155,7 +161,9 @@ sniffio==1.3.1 ; python_version >= "3.9" and python_version < "4.0" snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "4.0" soupsieve==2.6 ; python_version >= "3.9" and python_version < "4.0" sphinx-rtd-theme==3.0.2 ; python_version >= "3.9" and python_version < "4.0" -sphinx==7.4.7 ; python_version >= "3.9" and python_version < "4.0" +sphinx==7.4.7 ; python_version == "3.9" +sphinx==8.1.3 ; python_version == "3.10" +sphinx==8.2.3 ; python_version >= "3.11" and python_version < "4.0" sphinxcontrib-applehelp==2.0.0 ; python_version >= "3.9" and python_version < "4.0" sphinxcontrib-devhelp==2.0.0 ; python_version >= "3.9" and python_version < "4.0" sphinxcontrib-htmlhelp==2.1.0 ; python_version >= "3.9" and python_version < "4.0" @@ -164,7 +172,7 @@ sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "4.0" sphinxcontrib-qthelp==2.0.0 ; python_version >= "3.9" and python_version < "4.0" sphinxcontrib-serializinghtml==2.0.0 ; python_version >= "3.9" and python_version < "4.0" stack-data==0.6.3 ; python_version >= "3.9" and python_version < "4.0" -tldextract==5.1.3 ; python_version >= "3.9" and python_version < "4.0" +tldextract==5.2.0 ; python_version >= "3.9" and python_version < "4.0" tomli==2.2.1 ; python_version >= "3.9" and python_version < "3.11" tomlkit==0.13.2 ; python_version >= "3.9" and python_version < "4.0" tox==4.25.0 ; python_version >= "3.9" and python_version < "4.0" @@ -176,18 +184,18 @@ types-pyrfc3339==2.0.1.20241107 ; python_version >= "3.9" and python_version < " types-python-dateutil==2.9.0.20241206 ; python_version >= "3.9" and python_version < "4.0" types-pytz==2025.2.0.20250326 ; python_version >= "3.9" and python_version < "4.0" types-pywin32==310.0.0.20250319 ; python_version >= "3.9" and python_version < "4.0" -types-requests==2.31.0.6 ; python_version >= "3.9" and python_version < "3.10" +types-requests==2.31.0.6 ; python_version == "3.9" types-requests==2.32.0.20250328 ; python_version >= "3.10" and python_version < "4.0" types-setuptools==78.1.0.20250329 ; python_version >= "3.9" and python_version < "4.0" -types-urllib3==1.26.25.14 ; python_version >= "3.9" and python_version < "3.10" -typing-extensions==4.13.0 ; python_version >= "3.9" and python_version < "4.0" +types-urllib3==1.26.25.14 ; python_version == "3.9" +typing-extensions==4.13.2 ; python_version >= "3.9" and python_version < "4.0" uritemplate==4.1.1 ; python_version >= "3.9" and python_version < "4.0" -urllib3==1.26.20 ; python_version >= "3.9" and python_version < "3.10" -urllib3==2.3.0 ; python_version >= "3.10" and python_version < "4.0" +urllib3==1.26.20 ; python_version == "3.9" +urllib3==2.4.0 ; python_version >= "3.10" and python_version < "4.0" virtualenv==20.30.0 ; python_version >= "3.9" and python_version < "4.0" wcwidth==0.2.13 ; python_version >= "3.9" and python_version < "4.0" wheel==0.45.1 ; python_version >= "3.9" and python_version < "4.0" wrapt==1.17.2 ; python_version >= "3.9" and python_version < "4.0" xattr==1.1.4 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "darwin" -zipp==3.21.0 ; python_version >= "3.9" and python_version < "3.12" +zipp==3.21.0 ; python_version >= "3.9" and python_version <= "3.11" zstandard==0.23.0 ; python_version >= "3.9" and python_version < "4.0" diff --git a/tox.ini b/tox.ini index 4d640e84f..0d565242e 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,8 @@ pytest = python -m pytest {posargs} # Paths are listed on one line because tox seems to have inconsistent # behavior with substitutions that contain line continuations, see # https://github.com/tox-dev/tox/issues/2069 for more info. -mypy_strict_source_paths = certbot-ci/certbot_integration_tests certbot-ci/snap_integration_tests certbot-dns-cloudflare/certbot_dns_cloudflare certbot-dns-digitalocean/certbot_dns_digitalocean certbot-dns-dnsimple/certbot_dns_dnsimple certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy certbot-dns-gehirn/certbot_dns_gehirn certbot-dns-google/certbot_dns_google certbot-dns-linode/certbot_dns_linode certbot-dns-luadns/certbot_dns_luadns certbot-dns-nsone/certbot_dns_nsone certbot-dns-ovh/certbot_dns_ovh certbot-dns-rfc2136/certbot_dns_rfc2136 certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud -mypy_no_strict_source_paths = acme/acme certbot/certbot certbot-apache/certbot_apache certbot-compatibility-test/certbot_compatibility_test certbot-nginx/certbot_nginx +mypy_strict_source_paths = certbot-ci/src certbot-dns-cloudflare/src certbot-dns-digitalocean/src certbot-dns-dnsimple/src certbot-dns-dnsmadeeasy/src certbot-dns-gehirn/src certbot-dns-google/src certbot-dns-linode/src certbot-dns-luadns/src certbot-dns-nsone/src certbot-dns-ovh/src certbot-dns-rfc2136/src certbot-dns-route53/src certbot-dns-sakuracloud/src +mypy_no_strict_source_paths = acme/src certbot/src certbot-apache/src certbot-compatibility-test/src certbot-nginx/src source_paths = {[base]mypy_strict_source_paths} {[base]mypy_no_strict_source_paths} [testenv] @@ -162,27 +162,27 @@ deps = -e certbot -e certbot-apache commands = - {toxinidir}/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test --debian-modules + {toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test --debian-modules passenv = SERVER allowlist_externals = - {toxinidir}/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test + {toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/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/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py + {toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py commands = - {toxinidir}/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py --debian-modules + {toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/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/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py + {toxinidir}/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py commands = {[testenv:apacheconftest-external-with-pebble]commands} [testenv:nginxroundtrip] @@ -228,9 +228,9 @@ deps = -e certbot-nginx -e certbot-ci commands = - {[base]pytest} certbot-ci/certbot_integration_tests \ + {[base]pytest} certbot-ci/src/certbot_integration_tests \ --cov=acme --cov=certbot --cov=certbot_nginx --cov-report= \ - --cov-config=certbot-ci/certbot_integration_tests/.coveragerc + --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 passenv = DOCKER_* @@ -241,9 +241,9 @@ deps = -e certbot -e certbot-ci commands = - {[base]pytest} certbot-ci/certbot_integration_tests/certbot_tests \ + {[base]pytest} certbot-ci/src/certbot_integration_tests/certbot_tests \ --cov=acme --cov=certbot --cov-report= \ - --cov-config=certbot-ci/certbot_integration_tests/.coveragerc + --cov-config=certbot-ci/src/certbot_integration_tests/.coveragerc coverage report --include 'certbot/*' --show-missing --fail-under=62 [testenv:integration-dns-rfc2136] @@ -253,11 +253,11 @@ deps = -e certbot-dns-rfc2136 -e certbot-ci commands = - {[base]pytest} certbot-ci/certbot_integration_tests/rfc2136_tests \ + {[base]pytest} certbot-ci/src/certbot_integration_tests/rfc2136_tests \ --dns-server=bind \ --numprocesses=1 \ --cov=acme --cov=certbot --cov=certbot_dns_rfc2136 --cov-report= \ - --cov-config=certbot-ci/certbot_integration_tests/.coveragerc + --cov-config=certbot-ci/src/certbot_integration_tests/.coveragerc coverage report --include 'certbot/*' --show-missing --fail-under=45 coverage report --include 'certbot-dns-rfc2136/*' --show-missing --fail-under=86 @@ -266,7 +266,7 @@ description = Run integration tests with Certbot outside of the tox virtual envi deps = -e certbot-ci commands = - {[base]pytest} certbot-ci/certbot_integration_tests + {[base]pytest} certbot-ci/src/certbot_integration_tests passenv = DOCKER_* [testenv:integration-certbot-oldest] @@ -277,7 +277,7 @@ deps = basepython = {[testenv:oldest]basepython} commands = - {[base]pytest} certbot-ci/certbot_integration_tests/certbot_tests + {[base]pytest} certbot-ci/src/certbot_integration_tests/certbot_tests passenv = DOCKER_* setenv = {[testenv:oldest]setenv} @@ -290,7 +290,7 @@ deps = basepython = {[testenv:oldest]basepython} commands = - {[base]pytest} certbot-ci/certbot_integration_tests/nginx_tests + {[base]pytest} certbot-ci/src/certbot_integration_tests/nginx_tests passenv = DOCKER_* setenv = {[testenv:oldest]setenv}