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

fix: use subprocess32 for python2

Browse Source 
Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
This commit is contained in:
Nao YONASHIRO 2019-08-29 19:56:31 +09:00 committed by Ulysses Souza
parent bbdb3cab88
commit 719a1b0581
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compose/service.py
View File

@ -6,7 +6,6 @@ import json
import logging import logging
import os import os
import re import re
import subprocess
import sys import sys
import tempfile import tempfile
from collections import namedtuple from collections import namedtuple
@ -62,6 +61,11 @@ from .utils import parse_seconds_float
from .utils import truncate_id from .utils import truncate_id
from .utils import unique_everseen from .utils import unique_everseen
if six.PY2:
import subprocess32 as subprocess
else:
import subprocess
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

1
setup.py
View File

@ -52,6 +52,7 @@ if sys.version_info[:2] < (3, 4):
tests_require.append('mock >= 1.0.1, < 4') tests_require.append('mock >= 1.0.1, < 4')
extras_require = { extras_require = {
':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'], ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'],