Commit 71ac558
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,14 +5,11 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then | |||
| 5 | 5 | exit 1 | |
| 6 | 6 | fi | |
| 7 | 7 | ||
| 8 | + # Make sure we're running setuptools >= 18.5 | ||
| 9 | + pip install -U pip setuptools | ||
| 10 | + | ||
| 8 | 11 | pip install -U -r requirements-test.txt | |
| 9 | 12 | ||
| 10 | 13 | 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 | ||
| 18 | 15 | fi | |
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,3 +7,15 @@ genshi | |||
| 7 | 7 | # charade can be used as a fallback in case we are unable to determine | |
| 8 | 8 | # the encoding of a document. | |
| 9 | 9 | 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' | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,5 +2,5 @@ | |||
| 2 | 2 | ||
| 3 | 3 | flake8 | |
| 4 | 4 | nose | |
| 5 | - ordereddict # Python 2.6 | ||
| 6 | 5 | mock | |
| 6 | + ordereddict ; python_version < '2.7' | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,9 +7,7 @@ deps = | |||
| 7 | 7 | nose | |
| 8 | 8 | mock | |
| 9 | 9 | 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 | ||
| 13 | 11 | ||
| 14 | 12 | commands = | |
| 15 | 13 | {envbindir}/nosetests -q | |
0 commit comments