Skip to content

add flush=True for progressive stdout in recursive processes and cont… #1

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

Open
circle-queue wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add flush=True for progressive stdout in recursive processes and cont… #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions makefile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from subprocess import PIPE, CalledProcessError, Popen

venv_name = "venv"
activate = rf".\{venv_name}\Scripts\activate.bat & "
activate = rf".\{venv_name}\Scripts\activate.bat && "
wheelhouse_folder = r"\\md-man.biz\project-cph\bwcph\wheelhouse_3_10"
pip_ini = Path(venv_name) / "pip.ini"
pip_ini_txt = f"[install]\nno-index = true\nfind-links = {wheelhouse_folder}"
Expand All @@ -24,25 +24,25 @@ def venv():

run(f"{py_exe} -m venv {venv_name}")
pip_ini.write_text(pip_ini_txt)
run(f"{activate} python -m pip install -U pip")
run(f"{activate} python -m pip install -e .[dev]")
run(f"python -m pip install -U pip", activate_venv=True)
run(f"python -m pip install -e .[dev]", activate_venv=True)


def build():
"""Re-build wheel"""
run(f"{activate} python -m build --wheel --no-isolation")
run(f"python -m build --wheel --no-isolation", activate_venv=True)


def build_exe():
"""Build exe file"""
cmd = f"""
{activate} pyinstaller.exe pyinstaller_main.py
pyinstaller.exe pyinstaller_main.py
--name packaging-example
--collect-data "packaging_example.data"
--noconfirm --console --clean --onefile
"""
cmd = re.sub(r"\s+", " ", cmd)
run(cmd)
run(cmd, activate_venv=True)


def pytest():
Expand Down Expand Up @@ -120,18 +120,20 @@ def get_url_from_git_config(conf: Path = Path.cwd() / ".git" / "config") -> str:
return urls[0]


def run(cmd: str, echo_cmd=True, echo_stdout=True, cwd: Path = None) -> str:
def run(cmd: str, echo_cmd=True, echo_stdout=True, cwd: Path = None, activate_venv: bool = False) -> str:
"""Run shell command with option to print stdout incrementally"""
if activate_venv:
cmd = f"{activate} {cmd}"

echo_cmd and print(f"##\n## Running: {cmd}", end="")
cwd and print(f"\n## cwd: {cwd}")
echo_cmd and print(f"\n")

res = []
proc = Popen(cmd, stdout=PIPE, stderr=sys.stderr, shell=True, encoding=sys.getfilesystemencoding(), cwd=cwd)
while proc.poll() is None:
line = proc.stdout.readline()
echo_stdout and print(line, end="")
res.append(line)
with Popen(cmd, stdout=PIPE, stderr=sys.stderr, shell=True, encoding=sys.getfilesystemencoding(), cwd=cwd) as proc:
for line in proc.stdout:
echo_stdout and print(line, end="", flush=True)
res.append(line)

if proc.returncode != 0:
raise CalledProcessError(proc.returncode, cmd)
Expand Down