File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -47,11 +47,13 @@ if [ "x${envname}" = "x" ]; then
4747 exit 1
4848fi
4949
50+ # Activate the base environment
5051basedir=$( dirname $( dirname " ${conda_exe} " ) )
5152source ${basedir} /etc/profile.d/conda.sh
52-
53+ conda deactivate
5354conda activate base
5455
56+ # Get the list of packages to install
5557pkgfile=" ${scriptdir} /conda_dev_pkgs.txt"
5658pkglist=$( cat " ${pkgfile} " | xargs -I % echo -n ' "%" ' )
5759platform=$( python -c ' import sys; print(sys.platform)' )
6163 pkglist=" ${pkglist} gcc_linux-64 gxx_linux-64"
6264fi
6365
66+ # Determine whether the environment is a name or a
67+ # full path.
6468env_noslash=$( echo " ${envname} " | sed -e ' s/\///g' )
6569is_path=no
6670if [ " ${env_noslash} " != " ${envname} " ]; then
@@ -72,9 +76,10 @@ if [ "${env_noslash}" != "${envname}" ]; then
7276 env_check=" ${envname} "
7377 fi
7478else
75- env_check=$( conda env list | grep ${envname} )
79+ env_check=$( conda env list | grep " ${envname} " )
7680fi
77-
81+
82+ # Packages to install with pip instead of conda
7883pip_list=" pixell"
7984
8085if [ " x${env_check} " = " x" ]; then
Original file line number Diff line number Diff line change 1- 3.0.0a3
1+ 3.0.0a4
You can’t perform that action at this time.
0 commit comments