Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Daniel Gallagher 2018-05-28 14:06:35 -07:00
commit 05a362c9b5

13
tox.ini
View File

@ -3,18 +3,7 @@ envlist = flake8,py27,py33,py34,py35,py36,pre-commit,pypy
skipsdist = true
[testenv]
deps=
pytest>=2.7.2
graphql-core>=1.1
promise>=2.0
graphql-relay>=0.4.5
six
blinker
singledispatch
mock
pytz
iso8601
pytest-benchmark
deps = .[test]
setenv =
PYTHONPATH = .:{envdir}
commands=