Skip to content

Commit 321ecc4

Browse files
simoncozensm4rc1e
authored andcommitted
Improve venv build
1 parent e0ad637 commit 321ecc4

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Lib/gftools/packager/build.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,30 @@ def __init__(
133133

134134
def setup_venv(self, source_dir: Path):
135135
venv_task = self.progressbar.add_task(
136-
"[yellow]Setup venv", total=100, visible=False
136+
"[yellow]Setup venv", total=500, visible=False
137137
)
138138
self.progressbar.update(
139139
venv_task,
140140
description="[yellow] Setting up venv for " + self.name + "...",
141141
completed=0,
142142
visible=True,
143143
)
144-
if (source_dir / "Makefile").exists:
144+
if (source_dir / "Makefile").exists():
145145
with contextlib.chdir(source_dir):
146+
# self.progressbar.console.print(
147+
# "[yellow]Running make venv in " + str(source_dir)
148+
# )
146149
rc = self.run_command_with_callback(
147150
["make", "venv"],
148151
lambda line: self.progressbar.update(venv_task, advance=1),
149152
)
150-
elif (source_dir / "requirements.txt").exists:
151-
builder = EnvBuilder(system_site_packages=True, with_pip=True)
153+
elif (source_dir / "requirements.txt").exists():
154+
builder = EnvBuilder(system_site_packages=False, with_pip=True)
152155
builder.create(str(source_dir / "venv"))
153156
self.progressbar.update(venv_task, completed=10)
157+
# self.progressbar.console.print(
158+
# "[yellow]Running pip install in " + str(source_dir)
159+
# )
154160
with contextlib.chdir(source_dir):
155161
rc = self.run_command_with_callback(
156162
["venv/bin/pip", "install", "-r", "requirements.txt"],

0 commit comments

Comments
 (0)