Merge branch 'master' into candidate-2.7.3

certbot/CHANGELOG.md

@@ -10,7 +10,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/).
 
 ### Changed
 
-*
+* Support for Python 3.7 was removed.
 
 ### Fixed
 

certbot/certbot/__init__.py

@@ -1,13 +1,4 @@
 """Certbot client."""
-import sys
-import warnings
 
 # version number like 1.2.3a0, must have at least 2 parts, like 1.2
 __version__ = '2.8.0.dev0'
-
-if sys.version_info[:2] == (3, 7):
-    warnings.warn(
-            "Python 3.7 support will be dropped in the next planned release of "
-            "certbot. Please upgrade your Python version.",
-            PendingDeprecationWarning,
-    )  # pragma: no cover

certbot/certbot/_internal/display/completer.py

@@ -3,12 +3,9 @@ import glob
 from types import TracebackType
 from typing import Callable
 from typing import Iterator
+from typing import Literal
 from typing import Optional
 from typing import Type
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing_extensions import Literal
 
 # readline module is not available on all systems
 try:

certbot/certbot/_internal/main.py

@@ -1863,10 +1863,6 @@ def main(cli_args: Optional[List[str]] = None) -> Optional[Union[str, int]]:
         if config.func != plugins_cmd:  # pylint: disable=comparison-with-callable
             raise
 
-    if sys.version_info[:2] == (3, 7):
-        logger.warning("Python 3.7 support will be dropped in the next planned release "
-                       "of Certbot - please upgrade your Python version.")
-
     with make_displayer(config) as displayer:
         display_obj.set_display(displayer)
 

certbot/certbot/plugins/dns_test_common.py

@@ -1,7 +1,7 @@
 """Base test class for DNS authenticators."""
 from typing import Any
 from typing import Mapping
-from typing import TYPE_CHECKING
+from typing import Protocol
 from unittest import mock
 
 import configobj
@@ -14,12 +14,6 @@ from certbot.plugins.dns_common import DNSAuthenticator
 from certbot.tests import acme_util
 from certbot.tests import util as test_util
 
-if TYPE_CHECKING:
-    from typing_extensions import Protocol
-else:
-    Protocol = object
-
-
 DOMAIN = 'example.com'
 KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
 

certbot/certbot/plugins/dns_test_common_lexicon.py

@@ -6,8 +6,8 @@ from typing import Any
 from typing import cast
 from typing import Generator
 from typing import List
+from typing import Protocol
 from typing import Tuple
-from typing import TYPE_CHECKING
 from unittest import mock
 from unittest.mock import MagicMock
 import warnings
@@ -28,11 +28,6 @@ with warnings.catch_warnings():
 from certbot.plugins.dns_test_common import _AuthenticatorCallableTestCase
 from certbot.tests import util as test_util
 
-if TYPE_CHECKING:  # pragma: no cover
-    from typing_extensions import Protocol
-else:
-    Protocol = object
-
 DOMAIN = 'example.com'
 KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
 

certbot/docs/cli-help.txt

@@ -1,4 +1,4 @@
-usage: 
+usage:
   certbot [SUBCOMMAND] [options] [-d DOMAIN] [-d DOMAIN] ...
 
 Certbot can obtain and install HTTPS/TLS/SSL certificates.  By default,
@@ -36,7 +36,7 @@ manage your account:
   --agree-tos       Agree to the ACME server's Subscriber Agreement
    -m EMAIL         Email address for important account notifications
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
   -c CONFIG_FILE, --config CONFIG_FILE
                         path to config file (default: /etc/letsencrypt/cli.ini

certbot/setup.py

@@ -70,8 +70,7 @@ test_extras = [
     'coverage',
     'mypy',
     'pip',
-    # Our pinned version of pylint requires Python >= 3.7.2.
-    'pylint ; python_full_version >= "3.7.2"',
+    'pylint',
     'pytest',
     'pytest-cov',
     'pytest-xdist',
@@ -85,9 +84,6 @@ test_extras = [
     'types-requests',
     'types-setuptools',
     'types-six',
-    # typing-extensions is required to import typing.Protocol and make the mypy checks
-    # pass (along with pylint about non-existent objects) on Python 3.7
-    'typing-extensions',
     'wheel',
 ]
 
@@ -103,7 +99,7 @@ setup(
     author="Certbot Project",
     author_email='certbot-dev@eff.org',
     license='Apache License 2.0',
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
@@ -113,7 +109,6 @@ setup(
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',