diff --git a/certbot/setup.py b/certbot/setup.py index fdd3dea63..1c4c194f1 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -82,17 +82,17 @@ extras_require = { "wheel", ], "apache": [ - # If a user installes `certbot[apache]`, we want to include the shim + # If a user installs `certbot[apache]`, we want to include the shim f'certbot-apache>={version}', 'python-augeas', ], "nginx": [ - # If a user installes `certbot[nginx]`, we want to include the shim + # If a user installs `certbot[nginx]`, we want to include the shim f'certbot-nginx>={version}', # PyOpenSSL>=25.0.0 is just needed to satisfy mypy right now so this dependency can probably be # relaxed to >=24.0.0 if needed. 'PyOpenSSL>=25.0.0', - 'pyparsing>=2.4.7', + 'pyparsing>=3.0.0', ], "all": [ "certbot[dev,docs,test,apache,nginx]" diff --git a/mypy.ini b/mypy.ini index 2670294ed..4314e4db8 100644 --- a/mypy.ini +++ b/mypy.ini @@ -13,15 +13,3 @@ strict_equality = True # this "error" code removes this visual noise. disable_error_code = annotation-unchecked disallow_untyped_defs = False -[mypy-*.apache.tests.*] -# By default, mypy prints notes without erroring about any type annotations it -# finds in untyped function bodies when check_untyped_defs is false. Disabling -# this "error" code removes this visual noise. -disable_error_code = annotation-unchecked -disallow_untyped_defs = False -[mypy-*.nginx.tests.*] -# By default, mypy prints notes without erroring about any type annotations it -# finds in untyped function bodies when check_untyped_defs is false. Disabling -# this "error" code removes this visual noise. -disable_error_code = annotation-unchecked -disallow_untyped_defs = False diff --git a/tox.ini b/tox.ini index 608e94163..6a6478499 100644 --- a/tox.ini +++ b/tox.ini @@ -90,7 +90,7 @@ common_coverage_report_commands = commands = {[testenv:py]commands} --cov --cov-report= {[testenv:cover]coverage_report} --fail-under 100 --include acme/* - {[testenv:cover]coverage_report} --fail-under 95 --include certbot/* + {[testenv:cover]coverage_report} --fail-under 96 --include certbot/* {[testenv:cover]common_coverage_report_commands} # Another workaround for https://github.com/tox-dev/tox/issues/2858 in tox v4. @@ -117,6 +117,7 @@ commands = {[base]pytest} acme [testenv:isolated-certbot] description = Tests Certbot without any additional plugins installed +commands = {[base]pytest} certbot deps = {[testenv:isolated-acme]deps} -e certbot[test] @@ -232,7 +233,7 @@ commands = {[base]pytest} certbot-ci/src/certbot_integration_tests \ --cov=acme --cov=certbot --cov=certbot_nginx --cov-report= \ --cov-config=certbot-ci/src/certbot_integration_tests/.coveragerc - coverage report --include 'certbot/*' --show-missing --fail-under=65 + coverage report --include 'certbot/*' --show-missing --fail-under=71 passenv = DOCKER_* [testenv:integration-certbot]