aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2015-01-23 11:38:58 +0000
committerTom Christie2015-01-23 11:38:58 +0000
commite307fd289c52a9bb97a567cff314a479bbdd21df (patch)
treed86bf9d223ae5173d69607572a784783a530b0ee
parent5eb6949e9f24dd5e94aa5eb50fd6ccaf34b21878 (diff)
downloaddjango-rest-framework-e307fd289c52a9bb97a567cff314a479bbdd21df.tar.bz2
Fix test matrix
-rw-r--r--env/pip-selfcheck.json1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json
new file mode 100644
index 00000000..50cde956
--- /dev/null
+++ b/env/pip-selfcheck.json
@@ -0,0 +1 @@
+{"last_check":"2015-01-23T11:37:11Z","pypi_version":"6.0.6"} \ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 75ebe134..193b5813 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ deps =
{py26,py27}-django{14,15}: django-oauth2-provider==0.2.3
{py26,py27}-django16: django-oauth2-provider==0.2.4
pytest-django==2.8.0
- {py27,py32,py32,py33,py34}-django{14,15,16,17}: django-filter==0.7
+ {py26,py27,py32,py33,py34}-django{14,15,16,17}: django-filter==0.7
defusedxml==0.3
markdown>=2.1.0
PyYAML>=3.10