Skip to content

Commit 41b5b64

Browse files
authored
make pycall associate with correct python executable
1 parent 9898809 commit 41b5b64

1 file changed

Lines changed: 4 additions & 27 deletions

File tree

.conda/build.sh

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,14 @@
11
set -x
22

3-
# from https://github.com/ReactionMechanismGenerator/RMG-Py/pull/2631#issuecomment-1998723914
4-
#make julia directory
5-
mkdir -p ${PREFIX}/share/julia/site
6-
mkdir -p ${PREFIX}/bin
7-
#set JULIA_DEPOT_PATH in conda env
8-
export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site"
9-
ACTIVATE_ENV="${PREFIX}/etc/conda/activate.d/env_vars.sh"
10-
DEACTIVATE_ENV="${PREFIX}/etc/conda/deactivate.d/env_vars.sh"
11-
123
if [ -f "$ACTIVATE_ENV" ]; then
13-
echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
14-
echo "export JULIA_OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $ACTIVATE_ENV
15-
echo "export LD_LIBRARY_PATH=\"${PREFIX}/lib\"" >> $ACTIVATE_ENV
4+
echo 'python-jl -c "import julia; julia.install()"' >> $ACTIVATE_ENV
5+
# echo 'sed -i \'/julia.install/d\' $ACTIVATE_ENV' >> $ACTIVATE_ENV
166
else
177
mkdir -p ${PREFIX}/etc/conda/activate.d
188
touch ${PREFIX}/etc/conda/activate.d/env_vars.sh
199
echo '#!/bin/sh' >> $ACTIVATE_ENV
20-
echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
21-
echo "export JULIA_OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $ACTIVATE_ENV
22-
echo "export LD_LIBRARY_PATH=\"${PREFIX}/lib\"" >> $ACTIVATE_ENV
23-
fi
24-
if [ -f "$DEACTIVATE_ENV" ]; then
25-
echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
26-
echo "export LD_LIBRARY_PATH=$JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
27-
echo "unset JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
28-
else
29-
mkdir -p ${PREFIX}/etc/conda/deactivate.d
30-
touch ${PREFIX}/etc/conda/deactivate.d/env_vars.sh
31-
echo '#!/bin/sh' >> $DEACTIVATE_ENV
32-
echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
33-
echo "export LD_LIBRARY_PATH=$JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
34-
echo "unset JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
10+
echo 'python-jl -c "import julia; julia.install()"' >> $ACTIVATE_ENV
11+
# echo 'sed -i \'/julia.install/d\' $ACTIVATE_ENV' >> $ACTIVATE_ENV
3512
fi
3613

3714
make install

0 commit comments

Comments
 (0)