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

Commit71ac558

Browse files
committed
Update requirements files to match setup.py
1 parentc2321b0 commit71ac558

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed

‎requirements-install.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
55
exit 1
66
fi
77

8+
# Make sure we're running setuptools >= 18.5
9+
pip install -U pip setuptools
10+
811
pip install -U -r requirements-test.txt
912

1013
if [[$USE_OPTIONAL=="true" ]];then
11-
if [[$TRAVIS_PYTHON_VERSION=="pypy"||$TRAVIS_PYTHON_VERSION=="pypy3" ]];then
12-
pip install -U -r requirements-optional.txt
13-
elif [[$TRAVIS_PYTHON_VERSION=="2.6" ]];then
14-
pip install -U -r requirements-optional-2.6.txt
15-
else
16-
pip install -U -r requirements-optional-cpython.txt
17-
fi
14+
pip install -U -r requirements-optional.txt
1815
fi

‎requirements-optional-2.6.txt‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎requirements-optional-cpython.txt‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎requirements-optional.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,15 @@ genshi
77
# charade can be used as a fallback in case we are unable to determine
88
# the encoding of a document.
99
charade
10+
11+
# lxml is supported with its own treebuilder ("lxml") and otherwise
12+
# uses the standard ElementTree support
13+
lxml ; platform_python_implementation == 'CPython'
14+
15+
# DATrie can be used in place of our Python trie implementation for
16+
# slightly better parsing performance.
17+
datrie ; platform_python_implementation == 'CPython'
18+
19+
# Can be used to force attributes to be serialized in alphabetical
20+
# order.
21+
ordereddict ; python_version < '2.7'

‎requirements-test.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
flake8
44
nose
5-
ordereddict # Python 2.6
65
mock
6+
ordereddict ; python_version < '2.7'

‎tox.ini‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ deps =
77
nose
88
mock
99
py26-base: ordereddict
10-
py26-optional: -r{toxinidir}/requirements-optional-2.6.txt
11-
{py27,py32,py33,py34,py35}-optional: -r{toxinidir}/requirements-optional-cpython.txt
12-
{pypy,pypy3}-optional: -r{toxinidir}/requirements-optional.txt
10+
optional: -r{toxinidir}/requirements-optional.txt
1311

1412
commands =
1513
{envbindir}/nosetests -q

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp