Drop Django 1.2 support (for new url template tag)

jazzband · Apr 14, 2013 · a91ce5d · a91ce5d
1 parent 3187a2f
commit a91ce5d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,6 @@ script: coverage run -a --branch --include="simple_history/*" --omit="simple_his
 
 matrix:
   include:
-   - python: 2.7
-     env: DJANGO=Django==1.2.7 SOUTH=1
    - python: 2.5
      env: DJANGO=Django==1.3.7 SOUTH=1 COVERALLS=0
    - python: 2.5

diff --git a/setup.py b/setup.py
@@ -14,6 +14,6 @@
         "Development Status :: 5 - Production/Stable",
         "Framework :: Django",
     ],
-    tests_require=["Django>=1.2"],
+    tests_require=["Django>=1.3"],
     test_suite='runtests.main',
 )
diff --git a/simple_history/admin.py b/simple_history/admin.py
@@ -1,6 +1,6 @@
 from django import template
 from django.core.exceptions import PermissionDenied
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.contrib import admin
 from django.contrib.admin import helpers
 from django.contrib.contenttypes.models import ContentType

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py25-1.2,py25-1.3,py26-1.4,py26,py26-trunk,py27,py27-trunk,py27-1.5-nosouth
+envlist=py25-1.3,py26-1.4,py26,py26-trunk,py27,py27-trunk,py27-1.5-nosouth
 
 [testenv]
 deps=
@@ -8,13 +8,6 @@ deps=
   coverage==3.6
 commands=coverage run -a --branch setup.py test
 
-[testenv:py25-1.2]
-basepython=python2.5
-deps=
-  django==1.2.7
-  South==0.7.6
-  coverage==3.6
-
 [testenv:py25-1.3]
 basepython=python2.5
 deps=