Compare commits
2 Commits
be2aadb276
...
a1dfb3442a
Author | SHA1 | Date | |
---|---|---|---|
a1dfb3442a | |||
829e05599a |
|
@ -60,6 +60,10 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||||
build-essential libcap-dev tor
|
build-essential libcap-dev tor
|
||||||
|
|
||||||
|
|
||||||
|
# locales
|
||||||
|
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||||
|
language-pack-en
|
||||||
|
|
||||||
# cleanup
|
# cleanup
|
||||||
RUN rm -rf /var/lib/apt/lists/*
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,10 @@ if [[ "$(declare -p travis_python)" =~ "declare -a" ]]; then
|
||||||
# strip quotes
|
# strip quotes
|
||||||
temp="${pv%\"}"
|
temp="${pv%\"}"
|
||||||
pv="${temp#\"}"
|
pv="${temp#\"}"
|
||||||
# strip crap
|
|
||||||
options=$(echo "$pv"|cut -d_ -f2-)
|
options=$(echo "$pv"|cut -d_ -f2-)
|
||||||
|
if [ "$options" == "$pv" ]; then
|
||||||
|
unset options
|
||||||
|
fi
|
||||||
if [[ "$options" == with* ]]; then
|
if [[ "$options" == with* ]]; then
|
||||||
options="--$(echo "$options"|cut -d_ -f2-|tr -- '_' '-')"
|
options="--$(echo "$options"|cut -d_ -f2-|tr -- '_' '-')"
|
||||||
fi
|
fi
|
||||||
|
@ -176,7 +178,11 @@ if [[ "$(declare -p travis_python)" =~ "declare -a" ]]; then
|
||||||
sudo apt -y install "python$pv" "python${pv}-dev"
|
sudo apt -y install "python$pv" "python${pv}-dev"
|
||||||
#fi
|
#fi
|
||||||
|
|
||||||
virtualenv_init "$ppath" "$pv" "$options"
|
if [ -n "$options" ]; then
|
||||||
|
virtualenv_init "$ppath" "$pv" "$options"
|
||||||
|
else
|
||||||
|
virtualenv_init "$ppath" "$pv"
|
||||||
|
fi
|
||||||
virtualenv_activate "$pv"
|
virtualenv_activate "$pv"
|
||||||
python_run "$ppath" "$pv"
|
python_run "$ppath" "$pv"
|
||||||
deactivate
|
deactivate
|
||||||
|
|
Loading…
Reference in New Issue
Block a user