espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/tools_python_subprocess_capture_output_v4.2' into 'release/v4.2'

Browse Source 
tools: Avoid subprocess.run(capture_output) argument for Python <3.7 compatibility (v4.2)

See merge request espressif/esp-idf!11506
This commit is contained in:
Ivan Grokhotkov
2020-12-28 07:45:51 +08:00
parent 68095a65ac 244922a3e3
commit 4360410107
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ci/deploy_docs.py
View File

@@ -204,9 +204,9 @@ def is_stable_version(version):
if "-" in version:
return False # prerelease tag
git_out = subprocess.run(["git", "tag", "-l"], capture_output=True, check=True)
git_out = subprocess.check_output(["git", "tag", "-l"]).decode("utf-8")
versions = [v.strip() for v in git_out.stdout.decode("utf-8").split("\n")]
versions = [v.strip() for v in git_out.split("\n")]
versions = [v for v in versions if re.match(r"^v[\d\.]+$", v)] # include vX.Y.Z only
versions = [packaging.version.parse(v) for v in versions]

2
tools/idf_tools.py
View File

@@ -186,7 +186,7 @@ def run_cmd_check_output(cmd, input_text=None, extra_paths=None):
try:
if input_text:
input_text = input_text.encode()
result = subprocess.run(cmd, capture_output=True, check=True, input=input_text)
result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, input=input_text)
return result.stdout + result.stderr
except (AttributeError, TypeError):
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)