summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlysses Souza <ulyssessouza@gmail.com>2020-04-16 17:04:40 +0200
committerUlysses Souza <ulyssessouza@gmail.com>2020-04-16 20:04:05 +0200
commita62a1e1d6273d1b2021b072603ee9ffc86afc5c5 (patch)
treefaada07e92f9b0a53ef8f51f1f243cb0b03343d1
parent440c94ea7a7e62b3de50722120ca34c4e818205a (diff)
Add "distro" package
This package implements the method 'platform.linux_distribution' removed in Python 3.8 Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
-rw-r--r--compose/cli/utils.py3
-rw-r--r--requirements.txt1
-rw-r--r--setup.py1
3 files changed, 4 insertions, 1 deletions
diff --git a/compose/cli/utils.py b/compose/cli/utils.py
index 931487a6..40bef165 100644
--- a/compose/cli/utils.py
+++ b/compose/cli/utils.py
@@ -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():
diff --git a/requirements.txt b/requirements.txt
index b1bc6944..71b07540 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
diff --git a/setup.py b/setup.py
index bca578e1..cf273ed5 100644
--- a/setup.py
+++ b/setup.py
@@ -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',