Skip to content

Commit b9add99

Browse files
committed
Fix conda env setup script. Bump pre-release version.
1 parent e754b91 commit b9add99

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

platforms/conda_dev_setup.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ if [ "x${envname}" = "x" ]; then
4747
exit 1
4848
fi
4949

50+
# Activate the base environment
5051
basedir=$(dirname $(dirname "${conda_exe}"))
5152
source ${basedir}/etc/profile.d/conda.sh
52-
53+
conda deactivate
5354
conda activate base
5455

56+
# Get the list of packages to install
5557
pkgfile="${scriptdir}/conda_dev_pkgs.txt"
5658
pkglist=$(cat "${pkgfile}" | xargs -I % echo -n '"%" ')
5759
platform=$(python -c 'import sys; print(sys.platform)')
@@ -61,6 +63,8 @@ else
6163
pkglist="${pkglist} gcc_linux-64 gxx_linux-64"
6264
fi
6365

66+
# Determine whether the environment is a name or a
67+
# full path.
6468
env_noslash=$(echo "${envname}" | sed -e 's/\///g')
6569
is_path=no
6670
if [ "${env_noslash}" != "${envname}" ]; then
@@ -72,9 +76,10 @@ if [ "${env_noslash}" != "${envname}" ]; then
7276
env_check="${envname}"
7377
fi
7478
else
75-
env_check=$(conda env list | grep ${envname})
79+
env_check=$(conda env list | grep "${envname} ")
7680
fi
77-
81+
82+
# Packages to install with pip instead of conda
7883
pip_list="pixell"
7984

8085
if [ "x${env_check}" = "x" ]; then

src/toast/RELEASE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0a3
1+
3.0.0a4

0 commit comments

Comments
 (0)