From 2aff42e4a93c94b5fb1fda827447041192d3e290 Mon Sep 17 00:00:00 2001 From: James Turk Date: Wed, 4 Dec 2013 14:48:15 -0500 Subject: [PATCH] urls --- example/urls.py | 2 +- markupwiki/urls.py | 2 +- tox.ini | 54 ---------------------------------------------- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 tox.ini diff --git a/example/urls.py b/example/urls.py index b5bee8e..271a3de 100644 --- a/example/urls.py +++ b/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 diff --git a/markupwiki/urls.py b/markupwiki/urls.py index 9c64557..f1b702b 100644 --- a/markupwiki/urls.py +++ b/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.+)' diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 3265887..0000000 --- a/tox.ini +++ /dev/null @@ -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}