urls

example/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin

markupwiki/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from markupwiki.feeds import LatestEditsFeed, LatestArticleEditsFeed
 
 WIKI_REGEX = r'^(?P<title>.+)'

tox.ini

@@ -1,54 +0,0 @@
-[tox]
-envlist = py27-django14, py27-django15, py27-django16, py33-django15, py33-django16, flake8
-
-[testenv:flake8]
-deps = flake8
-commands = flake8 markupfield
-
-[django14]
-deps =
-    docutils
-    pygments
-    Markdown
-    django-markupfield
-    Django>=1.4,<1.5
-
-[django15]
-deps =
-    docutils
-    pygments
-    Markdown
-    django-markupfield
-    Django>=1.5,<1.6
-
-[django16]
-deps =
-    docutils
-    pygments
-    markdown
-    django-markupfield
-    Django>=1.6,<1.7
-
-[testenv]
-commands =
-    django-admin.py test --settings example.settings
-
-[testenv:py27-django14]
-basepython = python2.7
-deps = {[django14]deps}
-
-[testenv:py27-django15]
-basepython = python2.7
-deps = {[django15]deps}
-
-[testenv:py27-django16]
-basepython = python2.7
-deps = {[django16]deps}
-
-[testenv:py33-django15]
-basepython = python3.3
-deps = {[django15]deps}
-
-[testenv:py33-django16]
-basepython = python3.3
-deps = {[django16]deps}