aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorTom Christie2014-12-03 23:24:32 +0000
committerTom Christie2014-12-03 23:24:32 +0000
commit5e6052811716a494e995a84c497579867ee6acaa (patch)
treeee3b2a12ee552daac3a49862ae2fc6e934975b34 /tox.ini
parentcd4d8660211e7af3b06986b68a9281be0b8ffacf (diff)
parent3d6620c72a9cbaedecc37cc76e591a79409de305 (diff)
downloaddjango-rest-framework-5e6052811716a494e995a84c497579867ee6acaa.tar.bz2
Merge branch 'jpadilla-yaml' into version-3.1
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini1
1 files changed, 0 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 388eabc5..6f1616f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,6 @@ deps =
django-filter==0.7
defusedxml==0.3
markdown>=2.1.0
- PyYAML>=3.10
[testenv:py27-flake8]
deps =