Update deps.

ionelmc · Aug 21, 2014 · fbf0fda · fbf0fda
1 parent 50df80a
commit fbf0fda
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 111 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,16 +6,12 @@ env:
     LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
   matrix:
     - TOXENV=check
-    - TOXENV=2.6-1.3,coveralls
-    - TOXENV=2.6-1.3-nocover
     - TOXENV=2.6-1.4,coveralls
     - TOXENV=2.6-1.4-nocover
     - TOXENV=2.6-1.5,coveralls
     - TOXENV=2.6-1.5-nocover
     - TOXENV=2.6-1.6,coveralls
     - TOXENV=2.6-1.6-nocover
-    - TOXENV=2.7-1.3,coveralls
-    - TOXENV=2.7-1.3-nocover
     - TOXENV=2.7-1.4,coveralls
     - TOXENV=2.7-1.4-nocover
     - TOXENV=2.7-1.5,coveralls
@@ -36,8 +32,6 @@ env:
     - TOXENV=3.4-1.6-nocover
     - TOXENV=3.4-1.7,coveralls
     - TOXENV=3.4-1.7-nocover
-    - TOXENV=pypy-1.3,coveralls
-    - TOXENV=pypy-1.3-nocover
     - TOXENV=pypy-1.4,coveralls
     - TOXENV=pypy-1.4-nocover
     - TOXENV=pypy-1.5,coveralls

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,8 +3,6 @@ build: false
 environment:
   matrix:
     - TOXENV: check
-    - TOXENV: "2.7-1.3"
-    - TOXENV: "2.7-1.3-nocover"
     - TOXENV: "2.7-1.4"
     - TOXENV: "2.7-1.4-nocover"
     - TOXENV: "2.7-1.5"

diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,7 @@ addopts =
     --tb short
     --cov-report term-missing
 
-[matrix]  
+[matrix]
 # This is the configuration for the `./bootstrap` script. It generates `.travis.yml`, `tox.ini` and `appveyor.yml`
 # Syntax: [alias:] value [!variable[glob]] [&variable[glob]]
 #
@@ -51,10 +51,9 @@ python_versions =
     pypy
 
 dependencies =
-    1.3: Django==1.3.7 !python_versions[3.*]
-    1.4: Django==1.4.13 !python_versions[3.*]
-    1.5: Django==1.5.8
-    1.6: Django==1.6.5
+    1.4: Django==1.4.14 !python_versions[3.*]
+    1.5: Django==1.5.9
+    1.6: Django==1.6.6
     1.7: https://www.djangoproject.com/download/1.7.b4/tarball/ !python_versions[2.6]
 
 coverage_flags =

diff --git a/tox.ini b/tox.ini
@@ -3,16 +3,12 @@
 envlist =
     clean,
     check,
-    2.6-1.3,
-    2.6-1.3-nocover,
     2.6-1.4,
     2.6-1.4-nocover,
     2.6-1.5,
     2.6-1.5-nocover,
     2.6-1.6,
     2.6-1.6-nocover,
-    2.7-1.3,
-    2.7-1.3-nocover,
     2.7-1.4,
     2.7-1.4-nocover,
     2.7-1.5,
@@ -33,8 +29,6 @@ envlist =
     3.4-1.6-nocover,
     3.4-1.7,
     3.4-1.7-nocover,
-    pypy-1.3,
-    pypy-1.3-nocover,
     pypy-1.4,
     pypy-1.4-nocover,
     pypy-1.5,
@@ -100,28 +94,6 @@ commands = coverage erase
 usedevelop = true
 deps = coverage
 
-[testenv:2.6-1.3]
-basepython = python2.6
-setenv =
-    {[testenv]setenv}
-    WITH_COVERAGE=yes
-usedevelop = true
-commands =
-    {posargs:py.test --cov src -vv}
-deps =
-    {[testenv]deps}
-    coverage
-    pytest-cov
-    Django==1.3.7
-
-[testenv:2.6-1.3-nocover]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    coverage
-    pytest-cov
-    Django==1.3.7
-
 [testenv:2.6-1.4]
 basepython = python2.6
 setenv =
@@ -134,15 +106,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.4.13
+    Django==1.4.14
 
 [testenv:2.6-1.4-nocover]
 basepython = python2.6
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.4.13
+    Django==1.4.14
 
 [testenv:2.6-1.5]
 basepython = python2.6
@@ -156,15 +128,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:2.6-1.5-nocover]
 basepython = python2.6
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:2.6-1.6]
 basepython = python2.6
@@ -178,37 +150,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:2.6-1.6-nocover]
 basepython = python2.6
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
-
-[testenv:2.7-1.3]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    WITH_COVERAGE=yes
-usedevelop = true
-commands =
-    {posargs:py.test --cov src -vv}
-deps =
-    {[testenv]deps}
-    coverage
-    pytest-cov
-    Django==1.3.7
-
-[testenv:2.7-1.3-nocover]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    coverage
-    pytest-cov
-    Django==1.3.7
+    Django==1.6.6
 
 [testenv:2.7-1.4]
 basepython = python2.7
@@ -222,15 +172,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.4.13
+    Django==1.4.14
 
 [testenv:2.7-1.4-nocover]
 basepython = python2.7
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.4.13
+    Django==1.4.14
 
 [testenv:2.7-1.5]
 basepython = python2.7
@@ -244,15 +194,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:2.7-1.5-nocover]
 basepython = python2.7
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:2.7-1.6]
 basepython = python2.7
@@ -266,15 +216,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:2.7-1.6-nocover]
 basepython = python2.7
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:2.7-1.7]
 basepython = python2.7
@@ -310,15 +260,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:3.3-1.5-nocover]
 basepython = python3.3
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:3.3-1.6]
 basepython = python3.3
@@ -332,15 +282,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:3.3-1.6-nocover]
 basepython = python3.3
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:3.3-1.7]
 basepython = python3.3
@@ -376,15 +326,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:3.4-1.5-nocover]
 basepython = python3.4
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:3.4-1.6]
 basepython = python3.4
@@ -398,15 +348,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:3.4-1.6-nocover]
 basepython = python3.4
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:3.4-1.7]
 basepython = python3.4
@@ -430,28 +380,6 @@ deps =
     pytest-cov
     https://www.djangoproject.com/download/1.7.b4/tarball/
 
-[testenv:pypy-1.3]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    WITH_COVERAGE=yes
-usedevelop = true
-commands =
-    {posargs:py.test --cov src -vv}
-deps =
-    {[testenv]deps}
-    coverage
-    pytest-cov
-    Django==1.3.7
-
-[testenv:pypy-1.3-nocover]
-basepython = pypy
-deps =
-    {[testenv]deps}
-    coverage
-    pytest-cov
-    Django==1.3.7
-
 [testenv:pypy-1.4]
 basepython = pypy
 setenv =
@@ -464,15 +392,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.4.13
+    Django==1.4.14
 
 [testenv:pypy-1.4-nocover]
 basepython = pypy
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.4.13
+    Django==1.4.14
 
 [testenv:pypy-1.5]
 basepython = pypy
@@ -486,15 +414,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:pypy-1.5-nocover]
 basepython = pypy
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.5.8
+    Django==1.5.9
 
 [testenv:pypy-1.6]
 basepython = pypy
@@ -508,15 +436,15 @@ deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:pypy-1.6-nocover]
 basepython = pypy
 deps =
     {[testenv]deps}
     coverage
     pytest-cov
-    Django==1.6.5
+    Django==1.6.6
 
 [testenv:pypy-1.7]
 basepython = pypy