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

Merge pull request #790 from ZyX-I/tests-fix 

Fix travis CI build
This commit is contained in:
ZyX-I 2014-02-09 00:31:44 +03:00
parent 173159aea4 773d6a6600
commit b5c14553a9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
powerline/segments/common.py
View File

@ -101,8 +101,9 @@ def cwd(pl, segment_info, dir_shorten_len=None, dir_limit_depth=None, use_path_s
cwd = "[not found]" cwd = "[not found]"
else: else:
raise raise
home = u(segment_info['home']) home = segment_info['home']
if home: if home:
home = u(home)
cwd = re.sub('^' + re.escape(home), '~', cwd, 1) cwd = re.sub('^' + re.escape(home), '~', cwd, 1)
cwd_split = cwd.split(os.sep) cwd_split = cwd.split(os.sep)
cwd_split_len = len(cwd_split) cwd_split_len = len(cwd_split)

3
tests/install.sh
View File

@ -3,7 +3,8 @@ pip install .
pip install psutil pip install psutil
if python -c 'import sys; sys.exit(1 * (sys.version_info[0] != 2))' ; then if python -c 'import sys; sys.exit(1 * (sys.version_info[0] != 2))' ; then
# Python 2 # Python 2
pip install mercurial bzr pip install mercurial
pip install --allow-external bzr --allow-unverified bzr bzr
if python -c 'import sys; sys.exit(1 * (sys.version_info[1] >= 7))' ; then if python -c 'import sys; sys.exit(1 * (sys.version_info[1] >= 7))' ; then
# Python 2.6 # Python 2.6
pip install unittest2 argparse pip install unittest2 argparse