tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update code according to the changes in deps repository

This commit is contained in:
ZyX 2015-01-18 02:20:32 +03:00
parent e02e6dc1c7
commit 2debb7c146
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/install.sh
View File

@ -19,6 +19,7 @@ if test -n "$USE_UCS2_PYTHON" ; then
set +e
mkvirtualenv -p "$PYTHON" cpython-ucs2-$UCS2_PYTHON_VARIANT
set -e
. tests/bot-ci/scripts/common/main.sh
pip install .
if test "$UCS2_PYTHON_VARIANT" = "2.6" ; then
rm tests/bot-ci/deps/wheels/ucs2-CPython-${UCS2_PYTHON_VARIANT}*/pyuv*.whl
@ -33,10 +34,10 @@ else
rm tests/bot-ci/deps/wheels/$PYTHON_SUFFIX/pyuv*.whl
fi
pip install --no-deps tests/bot-ci/deps/wheels/$PYTHON_SUFFIX/*.whl
if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/zpython/zsh-${PYTHON_VERSION}.tar.gz"
sudo sh -c "cd /opt && tar xzf $archive"
fi
fi
if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/zpython/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}.tar.gz"
sudo sh -c "cd /opt && tar xzf $archive"
fi
archive="${PWD:-$(pwd)}/tests/bot-ci/deps/fish/fish.tar.gz"

7
tests/run_vim_tests.sh
View File

@ -4,7 +4,8 @@ FAILED=0
if test -z "$VIM" ; then
if test -n "$USE_UCS2_PYTHON" ; then
NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-double/vim"
NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-ucs2-double/vim"
OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$UCS2_PYTHON_VARIANT-ucs2/vim"
opt_dir="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT"
main_path="$opt_dir/lib/python$UCS2_PYTHON_VARIANT"
site_path="$main_path/site-packages"
@ -16,8 +17,8 @@ if test -z "$VIM" ; then
if test "$PYTHON_IMPLEMENTATION" != "CPython" ; then
exit 0
fi
NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$PYTHON_VERSION/vim"
OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$PYTHON_VERSION/vim"
NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$PYTHON_MM/vim"
OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$PYTHON_MM/vim"
if test -e "$OLD_VIM" ; then
VIMS="NEW_VIM OLD_VIM"
else

2
tests/test.sh
View File

@ -6,7 +6,7 @@ FAILED=0
export PATH="/opt/fish/bin:${PATH}"
if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
export PATH="/opt/zsh-${PYTHON_VERSION}/bin:${PATH}"
export PATH="/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}"
fi
if test -n "$USE_UCS2_PYTHON" ; then