Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-04 14:47:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #7374 from ulyssessouza/fix-distro-guess

Browse source 
Add "distro" package
This commit is contained in:
Ulysses Souza 2020-04-17 17:46:48 +02:00 • committed by GitHub
commit c22a25105e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compose/cli/utils.py
View file

@ -9,6 +9,7 @@ import ssl
import subprocess
import sys
import distro
import docker
import six
@ -73,7 +74,7 @@ def is_mac():
def is_ubuntu():
return platform.system() == 'Linux' and platform.linux_distribution()[0] == 'Ubuntu'
return platform.system() == 'Linux' and distro.linux_distribution()[0] == 'Ubuntu'
def is_windows():

1
requirements.txt
View file

@ -4,6 +4,7 @@ cached-property==1.5.1
certifi==2019.11.28
chardet==3.0.4
colorama==0.4.3; sys_platform == 'win32'
distro==1.5.0
docker==4.2.0
docker-pycreds==0.4.0
dockerpty==0.4.1

1
setup.py
View file

@ -36,6 +36,7 @@ install_requires = [
'requests >= 2.20.0, < 3',
'texttable >= 0.9.0, < 2',
'websocket-client >= 0.32.0, < 1',
'distro >= 1.5.0, < 2',
'docker[ssh] >= 3.7.0, < 5',
'dockerpty >= 0.4.1, < 1',
'six >= 1.3.0, < 2',