Add docker-compose as a requirement of certbot-ci (#7120)

Fixes #7110 

This PR declares docker-compose as a requirement for certbot-ci. This way, a recent version of docker-compose is installed in the standard virtual environment set up by `tools/venv.py` and `tools/venv3.py`, and so is available to pytest integration tests from `tox` or in the virtual environment enabled.

* Add docker-compose as a dev dependency and declares it in certbot-ci requirements

* Update docker-compose 1.25.0
This commit is contained in:
Adrien Ferrand
2019-12-18 13:21:54 -08:00
committed by Brad Warren
parent 6ac7aabaf7
commit b5a31bec03
3 changed files with 16 additions and 0 deletions
@@ -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
+1
View File
@@ -10,6 +10,7 @@ version = '0.32.0.dev0'
install_requires = [
'coverage',
'cryptography',
'docker-compose',
'pyopenssl',
'pytest',
'pytest-cov',
+14
View File
@@ -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