Cleanup zope dependencies in plugins and upgrade sphinx (#8997)

This PR removes all zope dependencies from plugins configuration.

It also lets Sphinx upgrade to the next major version by removing the plugin dedicated to zope interfaces documentation. As a consequence, the deprecated zope interfaces are not documented anymore.

* Cleanup zope dependencies in plugins and upgrade sphinx

* Update pinnings

certbot-apache/setup.py

@@ -11,8 +11,6 @@ install_requires = [
     f'certbot>={version}',
     'python-augeas',
     'setuptools>=39.0.1',
-    'zope.component',
-    'zope.interface',
 ]
 
 dev_extras = [

certbot-dns-cloudflare/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'cloudflare>=1.5.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-cloudxns/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-digitalocean/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-dnsimple/setup.py

@@ -11,7 +11,6 @@ install_requires = [
     # https://github.com/AnalogJ/lexicon/issues/387.
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-dnsmadeeasy/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-gehirn/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-google/setup.py

@@ -10,7 +10,6 @@ install_requires = [
     'google-api-python-client>=1.5.5',
     'oauth2client>=4.0',
     'setuptools>=39.0.1',
-    'zope.interface',
     # already a dependency of google-api-python-client, but added for consistency
     'httplib2'
 ]

certbot-dns-linode/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-luadns/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-nsone/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-ovh/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-rfc2136/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dnspython',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-route53/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'boto3',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-dns-sakuracloud/setup.py

@@ -9,7 +9,6 @@ version = '1.19.0.dev0'
 install_requires = [
     'dns-lexicon>=3.2.1',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 if not os.environ.get('SNAP_BUILD'):

certbot-nginx/setup.py

@@ -12,7 +12,6 @@ install_requires = [
     'PyOpenSSL>=17.3.0',
     'pyparsing>=2.2.0',
     'setuptools>=39.0.1',
-    'zope.interface',
 ]
 
 setup(

certbot/docs/conf.py

@@ -45,7 +45,6 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'repoze.sphinx.autointerface',
 ]
 
 if sphinx.version_info >= (1, 6):

certbot/setup.py

@@ -79,7 +79,6 @@ dev_extras = [
 docs_extras = [
     # If you have Sphinx<1.5.1, you need docutils<0.13.1
     # https://github.com/sphinx-doc/sphinx/issues/3212
-    'repoze.sphinx.autointerface',
     'Sphinx>=1.2',  # Annotation support
     'sphinx_rtd_theme',
 ]

tools/pinning/current/pyproject.toml

@@ -63,13 +63,6 @@ mock = "*"
 # here in addition to certbot/setup.py because otherwise the pre-release
 # version of poetry will not be installed.
 poetry = ">=1.2.0a1"
-# Because some parts of Certbot documentation are generated from zope.interfaces,
-# we need the Sphinx plugin repoze.sphinx.autointerface. This plugin is not
-# currently compatible with Sphinx>=4 though so we're pinning an older version
-# for now. See https://github.com/repoze/repoze.sphinx.autointerface/issues/16
-# for more info. This pinning could also be removed by the removal of
-# zope.interface in Certbot.
-sphinx = "<4"
 # Library traitlets is a transitive dependency of ipdb (traitlets -> ipython -> ipdb).
 # Version 5.x is incompatible with Python 3.6 but for some reasons, poetry fails to
 # add the appropriate marker and allows this version to be installed under Python 3.6.

tools/requirements.txt

@@ -12,15 +12,15 @@ appnope==0.1.2; python_version == "3.6" and sys_platform == "darwin" or python_v
 astroid==2.6.6; python_version >= "3.6" and python_version < "4.0"
 atomicwrites==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0"
 attrs==21.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
-awscli==1.20.22; python_version >= "3.6"
+awscli==1.20.23; python_version >= "3.6"
 azure-devops==6.0.0b4; python_version >= "3.6"
 babel==2.9.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0"
 backcall==0.2.0; python_version == "3.6" or python_version >= "3.7"
 bcrypt==3.2.0; python_version >= "3.6"
 beautifulsoup4==4.9.3; python_version >= "3.6" and python_version < "4.0" or python_version >= "3.6"
 bleach==4.0.0; python_version >= "3.6"
-boto3==1.18.22; python_version >= "3.6"
+boto3==1.18.23; python_version >= "3.6"
-botocore==1.21.22; python_version >= "3.6"
+botocore==1.21.23; python_version >= "3.6"
 cachecontrol==0.12.6; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0"
 cached-property==1.5.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 cachetools==4.2.2; python_version >= "3.5" and python_version < "4.0" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6")
@@ -31,7 +31,7 @@ chardet==4.0.0; python_version >= "3.6" and python_full_version < "3.0.0" or pyt
 charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3.6"
 cleo==1.0.0a4; python_version >= "3.6" and python_version < "4.0"
 cloudflare==2.8.15; python_version >= "3.6"
-colorama==0.4.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" or python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.5.0" or python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.6" and python_version < "4.0" and sys_platform == "win32" and python_full_version >= "3.5.0" or python_version >= "3.6" and python_full_version < "3.0.0" and platform_system == "Windows" or python_version >= "3.6" and python_full_version >= "3.5.0" and platform_system == "Windows" or python_version == "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or python_version == "3.6" and sys_platform == "win32" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_version >= "3.7" and sys_platform == "win32" and python_full_version >= "3.5.0"
+colorama==0.4.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" or python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or python_full_version >= "3.5.0" and python_version >= "3.6" and sys_platform == "win32" or python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.6" and python_version < "4.0" and sys_platform == "win32" and python_full_version >= "3.5.0" or python_version >= "3.6" and python_full_version < "3.0.0" and platform_system == "Windows" or python_version >= "3.6" and python_full_version >= "3.5.0" and platform_system == "Windows" or python_version == "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or python_version == "3.6" and sys_platform == "win32" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_version >= "3.7" and sys_platform == "win32" and python_full_version >= "3.5.0"
 configargparse==1.5.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 configobj==5.0.6; python_version >= "3.6"
 coverage==5.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6"
@@ -55,7 +55,7 @@ execnet==1.9.0; python_version >= "3.6" and python_full_version < "3.0.0" or pyt
 fabric==2.6.0; python_version >= "3.6"
 filelock==3.0.12; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.5.0" or python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_version < "4.0"
 google-api-core==1.31.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
-google-api-python-client==2.15.0; python_version >= "3.6"
+google-api-python-client==2.17.0; python_version >= "3.6"
 google-auth-httplib2==0.1.0; python_version >= "3.6"
 google-auth==1.35.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 googleapis-common-protos==1.53.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
@@ -94,7 +94,7 @@ mypy-extensions==0.4.3; python_version >= "3.6"
 mypy==0.910; python_version >= "3.6"
 oauth2client==4.1.3; python_version >= "3.6"
 oauthlib==3.1.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0"
-packaging==20.9; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_full_version >= "3.5.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
+packaging==20.9; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" or python_version >= "3.6" and python_full_version >= "3.5.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 paramiko==2.7.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" or python_version >= "3.6"
 parsedatetime==2.6; python_version >= "3.6"
 parso==0.8.2; python_version == "3.6"
@@ -139,7 +139,6 @@ pywin32-ctypes==0.2.0; python_version >= "3.6" and python_version < "4.0" and sy
 pywin32==301; sys_platform == "win32" and python_version >= "3.6" or sys_platform == "win32" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6")
 pyyaml==5.4.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" or python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0"
 readme-renderer==29.0; python_version >= "3.6"
-repoze.sphinx.autointerface==0.8; python_version >= "3.6"
 requests-download==0.1.2; python_version >= "3.6"
 requests-file==1.5.1; python_version >= "3.6" and python_version < "4.0"
 requests-oauthlib==1.3.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0"
@@ -155,7 +154,7 @@ six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python
 snowballstemmer==2.1.0; python_version >= "3.6"
 soupsieve==2.2.1; python_version >= "3.6"
 sphinx-rtd-theme==0.5.2; python_version >= "3.6"
-sphinx==3.5.4; python_version >= "3.5"
+sphinx==4.1.2; python_version >= "3.6"
 sphinxcontrib-applehelp==1.0.2; python_version >= "3.6"
 sphinxcontrib-devhelp==1.0.2; python_version >= "3.6"
 sphinxcontrib-htmlhelp==2.0.0; python_version >= "3.6"