Skip to content

Commit a23ef83

Browse files
committed
Generative environments, and disable lxml on pypy3 which doesn't work yet.
1 parent 7593c1a commit a23ef83

File tree

1 file changed

+17
-32
lines changed

1 file changed

+17
-32
lines changed

tox.ini

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[tox]
2-
envlist = py26, py27, pypy, pypy3, py34, docs, style
2+
envlist = py{26,27,34,py,py3}, docs, style
3+
34

45
[testenv]
56
# by default tox runs with --pre which tickles this bug:
@@ -8,50 +9,31 @@ install_command = pip install {opts} {packages}
89
commands =
910
py.test [] jsonschema
1011
{envpython} -m doctest README.rst
11-
deps =
12-
{[testenv:notpy34]deps}
13-
{[testenv:py34]deps}
14-
15-
[testenv:py26]
16-
deps =
17-
{[testenv:notpy34]deps}
18-
{[testenv:all]deps}
19-
argparse
20-
unittest2
21-
22-
[testenv:py34]
23-
commands =
24-
py.test [] jsonschema
25-
{envpython} -m doctest README.rst
26-
deps =
27-
{[testenv:all]deps}
28-
{[testenv:notpy26]deps}
29-
30-
[testenv:notpy34]
31-
deps =
32-
mock
33-
34-
[testenv:notpy26]
35-
deps =
36-
rfc3987
37-
38-
[testenv:all]
12+
py{26,27,34,py}: sphinx-build -b doctest docs {envtmpdir}/html
3913
deps =
4014
pytest
41-
sphinx
4215
strict-rfc3339
4316
webcolors
17+
py{27,34,py,py3}: rfc3987
18+
19+
py26: argparse
20+
py26: unittest2
21+
py{26,27,py,py3}: mock
22+
23+
py{26,27,34}: lxml
24+
pypy: git+https://github.com/amauryfa/lxml.git@cffi
25+
py{26,27,34,py}: sphinx
26+
4427

4528
[testenv:coverage]
4629
commands =
4730
coverage run --branch --source jsonschema [] {envbindir}/py.test jsonschema
4831
coverage report --show-missing
4932
coverage html
5033
deps =
51-
{[testenv:notpy34]deps}
52-
{[testenv:py34]deps}
5334
coverage
5435

36+
5537
[testenv:docs]
5638
basepython = python
5739
changedir = docs
@@ -60,13 +42,16 @@ deps =
6042
commands =
6143
sphinx-build [] -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
6244

45+
6346
[testenv:style]
6447
deps = flake8
6548
commands =
6649
flake8 [] --max-complexity 10 jsonschema
6750

51+
6852
[flake8]
6953
ignore = E203,E302,E303,E701,F811
7054

55+
7156
[pytest]
7257
addopts = -r s -s

0 commit comments

Comments
 (0)