Merge branch 'master' into certbot-auto-sunset

.azure-pipelines/templates/installer-tests.yml

@@ -42,7 +42,7 @@ jobs:
         displayName: Install Certbot
       - powershell: Invoke-WebRequest https://www.python.org/ftp/python/3.8.0/python-3.8.0-amd64-webinstall.exe -OutFile C:\py3-setup.exe
         displayName: Get Python
-      - script: C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=0 Include_debug=0 Include_tcltk=0 TargetDir=C:\py3
+      - script: C:\py3-setup.exe /quiet PrependPath=1 InstallAllUsers=1 Include_launcher=1 InstallLauncherAllUsers=1 Include_test=0 Include_doc=0 Include_dev=1 Include_debug=0 Include_tcltk=0 TargetDir=C:\py3
         displayName: Install Python
       - script: |
           py -3 -m venv venv

.travis.yml

@@ -175,7 +175,7 @@ matrix:
     - python: "3.7"
       env: TOXENV=py37
       <<: *extended-test-suite
-    - python: "3.8-dev"
+    - python: "3.8"
       env: TOXENV=py38
       <<: *extended-test-suite
     - python: "3.4"
@@ -218,10 +218,10 @@ matrix:
       sudo: required
       services: docker
       <<: *extended-test-suite
-    - python: "3.8-dev"
+    - python: "3.8"
       env: ACME_SERVER=boulder-v1 TOXENV=integration
       <<: *extended-test-suite
-    - python: "3.8-dev"
+    - python: "3.8"
       env: ACME_SERVER=boulder-v2 TOXENV=integration
       <<: *extended-test-suite
     - sudo: required

certbot-ci/certbot_integration_tests/conftest.py

@@ -6,6 +6,7 @@ for a directory a specific configuration using built-in pytest hooks.
 
 See https://docs.pytest.org/en/latest/reference.html#hook-reference
 """
+from __future__ import print_function
 import contextlib
 import subprocess
 import sys

certbot-ci/setup.py

@@ -10,6 +10,7 @@ version = '0.32.0.dev0'
 install_requires = [
     'coverage',
     'cryptography',
+    'docker-compose',
     'pyopenssl',
     'pytest',
     'pytest-cov',

certbot/docs/contributing.rst

@@ -300,6 +300,16 @@ configuration checkpoints and rollback.
 Writing your own plugin
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+.. note:: The Certbot team is not currently accepting any new DNS plugins
+    because we want to rethink our approach to the challenge and resolve some
+    issues like `#6464 <https://github.com/certbot/certbot/issues/6464>`_,
+    `#6503 <https://github.com/certbot/certbot/issues/6503>`_, and `#6504
+    <https://github.com/certbot/certbot/issues/6504>`_ first.
+
+    In the meantime, you're welcome to release it as a third-party plugin. See
+    `certbot-dns-ispconfig <https://github.com/m42e/certbot-dns-ispconfig>`_
+    for one example of that.
+
 Certbot client supports dynamic discovery of plugins through the
 `setuptools entry points`_ using the `certbot.plugins` group. This
 way you can, for example, create a custom implementation of
@@ -328,12 +338,6 @@ plugins. It's technically possible to install third-party plugins into
 the virtualenv used by `certbot-auto`, but they will be wiped away when
 `certbot-auto` upgrades.
 
-.. warning:: Please be aware though that as this client is still in a
-   developer-preview stage, the API may undergo a few changes. If you
-   believe the plugin will be beneficial to the community, please
-   consider submitting a pull request to the repo and we will update
-   it with any necessary API changes.
-
 .. _`setuptools entry points`:
     http://setuptools.readthedocs.io/en/latest/pkg_resources.html#entry-points
 

certbot/docs/install.rst

@@ -70,11 +70,13 @@ The ``certbot-auto`` wrapper script installs Certbot, obtaining some dependencie
 from your web server OS and putting others in a python virtual environment. You can
 download and run it as follows::
 
-  user@webserver:~$ wget https://dl.eff.org/certbot-auto
-  user@webserver:~$ sudo mv certbot-auto /usr/local/bin/certbot-auto
-  user@webserver:~$ sudo chown root /usr/local/bin/certbot-auto
-  user@webserver:~$ chmod 0755 /usr/local/bin/certbot-auto
-  user@webserver:~$ /usr/local/bin/certbot-auto --help
+  wget https://dl.eff.org/certbot-auto
+  sudo mv certbot-auto /usr/local/bin/certbot-auto
+  sudo chown root /usr/local/bin/certbot-auto
+  sudo chmod 0755 /usr/local/bin/certbot-auto
+  /usr/local/bin/certbot-auto --help
+
+To remove certbot-auto, just delete it and the files it places under /opt/eff.org, along with any cronjob or systemd timer you may have created.
 
 To check the integrity of the ``certbot-auto`` script,
 you can use these steps::

tools/dev_constraints.txt

@@ -11,8 +11,11 @@ attrs==17.3.0
 Babel==2.5.1
 backports.functools-lru-cache==1.5
 backports.shutil-get-terminal-size==1.0.0
+backports.ssl-match-hostname==3.7.0.1
+bcrypt==3.1.6
 boto3==1.9.36
 botocore==1.12.36
+cached-property==1.5.1
 cloudflare==1.5.1
 codecov==2.0.15
 configparser==3.7.4
@@ -21,8 +24,14 @@ coverage==4.5.4
 decorator==4.1.2
 dns-lexicon==3.2.1
 dnspython==1.15.0
+docker==3.7.2
+docker-compose==1.25.0
+docker-pycreds==0.4.0
+dockerpty==0.4.1
+docopt==0.6.2
 docutils==0.12
 execnet==1.5.0
+functools32==3.2.3.post2
 future==0.16.0
 futures==3.1.1
 filelock==3.0.12
@@ -37,6 +46,7 @@ isort==4.3.21
 Jinja2==2.9.6
 jmespath==0.9.3
 josepy==1.1.0
+jsonschema==2.6.0
 lazy-object-proxy==1.4.3
 logger==1.4
 logilab-common==1.4.1
@@ -48,6 +58,7 @@ mypy-extensions==0.4.3
 ndg-httpsclient==0.3.2
 oauth2client==4.0.0
 packaging==19.2
+paramiko==2.4.2
 pathlib2==2.3.0
 pexpect==4.7.0
 pickleshare==0.7.4
@@ -62,6 +73,7 @@ Pygments==2.2.0
 pylint==2.4.3
 # If pynsist version is upgraded, our NSIS template windows-installer/template.nsi
 # must be upgraded if necessary using the new built-in one from pynsist.
+pynacl==1.3.0
 pynsist==2.4
 pytest==3.2.5
 pytest-cov==2.5.1
@@ -85,6 +97,7 @@ snowballstemmer==1.2.1
 Sphinx==1.7.5
 sphinx-rtd-theme==0.2.4
 sphinxcontrib-websupport==1.0.1
+texttable==0.9.1
 tldextract==2.2.0
 toml==0.10.0
 tox==3.14.0
@@ -96,5 +109,6 @@ typing==3.6.4
 uritemplate==3.0.0
 virtualenv==16.6.2
 wcwidth==0.1.7
+websocket-client==0.56.0
 wrapt==1.11.2
 zipp==0.6.0