Skip to content
This repository was archived by the owner on Sep 26, 2025. It is now read-only.

Commit afb5a92

Browse files
authored
Revert patch (#89)
1 parent 4840abe commit afb5a92

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

pyctdev/_conda.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import glob
3131
import json
3232
import re
33-
import shlex
34-
import shutil
3533
import sys
3634
import warnings
3735
try:
@@ -176,13 +174,8 @@ def _conda_install_with_options(options,channel,env_name_again,no_pin_deps,all_e
176174
deps = " ".join('"%s"'%dep for dep in deps)
177175
# TODO and join the club?
178176
e = '' if env_name_again=='' else '-n %s'%env_name_again
179-
if conda_mode == 'mamba':
180-
bin_path = shutil.which('mamba')
181-
else:
182-
bin_path = CONDA_ROOT_EXE
183-
cmd = "%s install -y " % (bin_path) + e + " %s %s" % (" ".join(['-c %s' % c for c in channel]), deps)
177+
cmd = "%s install -y " % (conda_mode) + e + " %s %s" % (" ".join(['-c %s' % c for c in channel]), deps)
184178
print('Install runtime dependencies with:', cmd)
185-
cmd = shlex.split(cmd)
186179
return cmd
187180
else:
188181
return echo("Skipping conda install (no dependencies)")
@@ -890,7 +883,7 @@ def task_develop_install():
890883
"""
891884
return {'actions': [
892885
CmdAction(_conda_build_deps),
893-
CmdAction(_conda_install_with_options_hacked, shell=False),
886+
CmdAction(_conda_install_with_options_hacked),
894887
python_develop],
895888
'params': [_options_param,_channel_param,no_pin_deps,_all_extras_param,_conda_mode_param]}
896889

0 commit comments

Comments
 (0)