tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change docker-py dependency error to a warning, update fix command

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-03-21 16:28:53 -07:00
parent 70d28e8cf2
commit cd3343440c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compose/cli/__init__.py
View File

@ -20,16 +20,15 @@ try:
list(filter(lambda p: p.startswith(b'docker-py=='), packages)) list(filter(lambda p: p.startswith(b'docker-py=='), packages))
) > 0 ) > 0
if dockerpy_installed: if dockerpy_installed:
from .colors import red from .colors import yellow
print( print(
red('ERROR:'), yellow('WARNING:'),
"Dependency conflict: an older version of the 'docker-py' package " "Dependency conflict: an older version of the 'docker-py' package "
"is polluting the namespace. " "may be polluting the namespace. "
"Run the following command to remedy the issue:\n" "If you're experiencing crashes, run the following command to remedy the issue:\n"
"pip uninstall docker docker-py; pip install docker", "pip uninstall docker-py; pip uninstall docker; pip install docker",
file=sys.stderr file=sys.stderr
) )
sys.exit(1)
except OSError: except OSError:
# pip command is not available, which indicates it's probably the binary # pip command is not available, which indicates it's probably the binary