@@ -137,21 +137,28 @@ def arg_to_python_interpreter(argument: Optional[str]) -> str:
137
137
return exe
138
138
139
139
140
- def main_create (venv_dir : Path , interpreter : Optional [str ]):
141
- if venv_dir .exists ():
142
- raise VenvExistsExit (venv_dir )
140
+ def main_create (dirs : Dirs , interpreter : Optional [str ]):
141
+ if dirs . venv_dir .exists ():
142
+ raise VenvExistsExit (dirs . venv_dir )
143
143
144
144
exe = arg_to_python_interpreter (interpreter )
145
145
146
- print (f"Creating { venv_dir } " )
146
+ print (f"Creating { dirs . venv_dir } " )
147
147
148
- result = subprocess .run ([exe , "-m" , "venv" , str (venv_dir )])
148
+ result = subprocess .run ([exe , "-m" , "venv" , str (dirs . venv_dir )])
149
149
if result .returncode == 0 :
150
150
print ()
151
- print ("The Python executable:" )
152
- print (str (venv_dir_to_python_exe (venv_dir )))
151
+ print ("PROJECT DIR (unmodified)" )
152
+ print (f" { dirs .project_dir } " )
153
+ print ()
154
+ # (for projects named '{os.path.basename(dirs.project_dir)}')
155
+ print (f"VIRTUAL ENVIRONMENT (created)" )
156
+ print (f" { dirs .venv_dir } " )
157
+ print ()
158
+ print ("PYTHON EXECUTABLE (virtual)" )
159
+ print (f" { venv_dir_to_python_exe (dirs .venv_dir )} " )
153
160
else :
154
- raise FailedToCreateVenvExit (venv_dir )
161
+ raise FailedToCreateVenvExit (dirs . venv_dir )
155
162
156
163
157
164
def main_delete (venv_dir : Path ):
@@ -180,10 +187,10 @@ def main_delete(venv_dir: Path):
180
187
shutil .rmtree (str (venv_dir ))
181
188
182
189
183
- def main_recreate (venv_dir : Path , interpreter : Optional [str ]):
184
- if venv_dir .exists ():
185
- main_delete (venv_dir )
186
- main_create (venv_dir = venv_dir , interpreter = interpreter )
190
+ def main_recreate (dirs : Dirs , interpreter : Optional [str ]):
191
+ if dirs . venv_dir .exists ():
192
+ main_delete (dirs . venv_dir )
193
+ main_create (dirs , interpreter = interpreter )
187
194
188
195
189
196
def guess_bash_ps1 ():
@@ -460,9 +467,9 @@ def main_entry_point(args: Optional[List[str]] = None):
460
467
dirs = Dirs (project_dir = get_project_dir (parsed ))
461
468
462
469
if parsed .command == Commands .create :
463
- main_create (dirs . venv_dir , parsed .python_executable )
470
+ main_create (dirs , parsed .python_executable )
464
471
elif parsed .command == Commands .recreate :
465
- main_recreate (dirs . venv_dir ,
472
+ main_recreate (dirs ,
466
473
parsed .python_executable ) # todo .existing()?
467
474
elif parsed .command == Commands .delete : # todo move 'existing' check from func?
468
475
main_delete (dirs .venv_dir )
0 commit comments