Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitec674a9

Browse files
authored
Fix Travis (html5lib#319)
There were two causes of breakage: - using pip 6.0.7, which doesn't properly install things in the right order - requirements-install.sh not properly handling the case where SIX_VERSION isn't defined
1 parent1a28d72 commitec674a9

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
-SIX_VERSION=1.9 USE_OPTIONAL=true
2020

2121
install:
22-
-bashrequirements-install.sh
22+
-./requirements-install.sh
2323

2424
script:
2525
-if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then py.test; fi

‎requirements-install.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
#!/bin/bash -e
1+
#!/bin/bash -ex
22

3-
if [[$USE_OPTIONAL!="true"&&$USE_OPTIONAL!="false" ]];then
4-
echo"fatal:\$USE_OPTIONAL not set to true or false. Exiting."
5-
exit 1
6-
fi
3+
pip install pip==6.1.0
74

85
pip install -U -r requirements-test.txt
96

107
if [[$USE_OPTIONAL=="true" ]];then
118
pip install -U -r requirements-optional.txt
129
fi
1310

14-
if [[$SIX_VERSION!="false"]];then
11+
if [[$SIX_VERSION ]];then
1512
pip install six==$SIX_VERSION
1613
fi
1714

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp