File tree 1 file changed +9
-1
lines changed
1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change 53
53
from spyder .app .cli_options import get_options
54
54
from spyder .config .base import (get_conf_path , reset_config_files ,
55
55
running_under_pytest , is_conda_based_app )
56
- from spyder .utils .conda import get_conda_root_prefix
56
+ from spyder .utils .conda import get_conda_root_prefix , is_conda_env
57
57
from spyder .utils .external import lockfile
58
58
from spyder .py3compat import is_text_string
59
59
74
74
else :
75
75
os .environ ['CONDA_EXE' ] = conda_root + '/bin/conda'
76
76
77
+ # Qt needs to find libraries in Library\bin to render splash screen properly.
78
+ # If running in a conda environment that is not activated, then we need to add
79
+ # this path to PATH. See spyder-ide/spyder#22374
80
+ if os .name == 'nt' and is_conda_env (pyexec = sys .executable ):
81
+ bin_path = osp .join (sys .prefix , r'Library\bin' )
82
+ if bin_path not in os .getenv ('PATH' ):
83
+ os .environ ['PATH' ] = bin_path + osp .pathsep + os .getenv ('PATH' )
84
+
77
85
# Get argv
78
86
if running_under_pytest ():
79
87
sys_argv = [sys .argv [0 ]]
You can’t perform that action at this time.
0 commit comments