@@ -70,21 +70,7 @@ function install_conda() {
7070 conda config --add channels anaconda
7171 conda config --add channels conda-forge
7272
73- EXTRA_PACKAGES=" "
74-
75- # linux (only) deps
76- if [[ " $( uname) " == " Linux" ]]; then
77- # required by install_python_module.sh
78- EXTRA_PACKAGES=" zlib=1.2.11 patchelf=0.13"
79- fi
80-
81- # linux and mac (only) deps
82- if [[ " $( uname) " == " Linux" || " $( uname) " == " Darwin" ]]; then
83- EXTRA_PACKAGES=" $EXTRA_PACKAGES openmp=8.0.1 ncurses=6.2 libuuid=2.32.1"
84- fi
85-
86- # create and activate shapeworks env
87- if ! conda create --yes --name $CONDAENV python=3.7.8 \
73+ CONDA_PACKAGES=(python=3.7.8 \
8874 cmake=3.18.2 \
8975 gtest=1.10.0 \
9076 colorama=0.4.3 \
@@ -104,20 +90,33 @@ function install_conda() {
10490 pybind11=2.5.0 \
10591 nlohmann_json=3.10.5 \
10692 pkg-config=0.29.2 \
107- pip=21.2.4 \
108- $EXTRA_PACKAGES
109- ; then return 1;
93+ pip=21.2.4
94+ )
95+
96+ # linux (only) deps
97+ if [[ " $( uname) " == " Linux" ]]; then
98+ # required by install_python_module.sh
99+ CONDA_PACKAGES+=(zlib=1.2.11 patchelf=0.13)
100+ fi
101+
102+ # linux and mac (only) deps
103+ if [[ " $( uname) " == " Linux" || " $( uname) " == " Darwin" ]]; then
104+ CONDA_PACKAGES+=(openmp=8.0.1 ncurses=6.2 libuuid=2.32.1)
110105 fi
111106
107+ echo " Installing CONDA_PACKAGES = ${CONDA_PACKAGES[@]} "
108+
109+ # create and activate shapeworks env
110+ if ! conda create --yes --name $CONDAENV ${CONDA_PACKAGES[@]} ; then
111+ return 1;
112+ fi
112113
113114 eval " $( conda shell.bash hook) "
114115 if ! conda activate $CONDAENV ; then return 1; fi
115116
116117 # install conda into the shell
117118 conda init
118119
119-
120-
121120 which pip
122121 if ! pip install notebook==6.1.5; then return 1; fi
123122 if ! pip install trimesh==3.9.28; then return 1; fi
0 commit comments