Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid I/O deadlock with conda #581

Merged
merged 2 commits into from
Jan 18, 2024
+12 −3
Merged

Avoid I/O deadlock with conda #581

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a985bf
Avoid I/O deadlock with conda
tadeu Jan 15, 2024
62c44ac
Avoid an error in case `p.stdout` is `None`
tadeu Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions conda_lock/invoke_conda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import shutil
import subprocess
import tempfile
import threading

from distutils.version import LooseVersion
from typing import IO, Dict, Iterator, List, Optional, Sequence, Union
Expand Down Expand Up @@ -116,14 +117,21 @@ def _invoke_conda(
) as p:
stdout = []
if p.stdout:
for line in _process_stdout(p.stdout):
logging.info(line)
stdout.append(line)

def read_stdout() -> None:
assert p.stdout is not None
for line in _process_stdout(p.stdout):
logging.info(line)
stdout.append(line)

stdout_thread = threading.Thread(target=read_stdout)
stdout_thread.start()
stderr = []
if p.stderr:
for line in p.stderr:
stderr.append(line)
logging.error(line.rstrip())
stdout_thread.join()
tadeu marked this conversation as resolved.
Show resolved Hide resolved

if check_call and p.returncode != 0:
raise subprocess.CalledProcessError(
Expand Down