Commits

Carl Meyer committed cf6de85

Update tox.ini for newer Django versions; drop Python 2.5 and Django 1.3.

Comments (0)

Files changed (6)

 tip (unreleased)
 ----------------
 
+* BACKWARDS-INCOMPATIBLE: Dropped support for Python 2.5 and Django 1.3.
+
 1.1.0 (2013.04.26)
 ------------------
 
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 from markitup.views import apply_filter
 

tests/test_settings.py

 ROOT_URLCONF = "tests.urls"
 
 MARKITUP_FILTER = ("tests.filter.testfilter", {"arg": "replacement"})
+
+SECRET_KEY = 'test-secret'
 
     def testFormFieldContents(self):
         form = self.form_class(instance=self.post)
-        self.assertEquals(unicode(form['body']),
+        self.assertHTMLEqual(unicode(form['body']),
                           u'<textarea id="id_body" rows="10" cols="40" name="body">**markdown**</textarea>')
 
 
 
     def testHiddenFieldContents(self):
         form = self.form_class(instance=self.post)
-        self.assertEquals(unicode(form['body']), (
+        self.assertHTMLEqual(unicode(form['body']), (
             u'<textarea id="id_body" rows="10" cols="40" name="body">'
             u'[link](http://example.com) &amp; &quot;text&quot;'
             u'</textarea><input type="hidden" name="initial-body" value="'
 <script type="text/javascript" src="%(prefix)s/markitup/ajax_csrf.js"></script>
 <script type="text/javascript" src="%(prefix)s/markitup/jquery.markitup.js"></script>
 <script type="text/javascript" src="%(prefix)s/markitup/sets/default/set.js"></script>""" % {'prefix': self.prefix}
-        self.assertEquals(self._get_media(), out)
+        self.assertHTMLEqual(self._get_media(), out)
 
 
     def test_jquery_url(self):
                 if url:
                     self.assertIn(link, self._get_js())
                 else:
-                    self.assertEqual(
+                    self.assertHTMLEqual(
                         self._get_js(),
                         (
                             '<script type="text/javascript" src="%(prefix)s/markitup/ajax_csrf.js"></script>\n'
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 
 urlpatterns = patterns('',
     url(r'^markitup/', include('markitup.urls')),
 [tox]
-envlist=py25,py25-trunk,py26,py26-trunk,py27,py27-trunk
+envlist=py26-1.4,py26,py26-trunk,py27-1.4,py27,py27-trunk
 
 [testenv]
 deps=
-  django==1.3
-  South==0.7.3
+  django==1.5.1
+  South==0.7.6
 commands=python setup.py test
 
-[testenv:py25-trunk]
-basepython=python2.5
+[testenv:py26-1.4]
+basepython=python2.6
 deps=
-  https://github.com/django/django/tarball/master
-  South==0.7.3
+  django==1.4.5
+  South==0.7.6
 
 [testenv:py26-trunk]
 basepython=python2.6
 deps=
   https://github.com/django/django/tarball/master
-  South==0.7.3
+  South==0.7.6
+
+[testenv:py27-1.4]
+basepython=python2.7
+deps=
+  django==1.4.5
+  South==0.7.6
 
 [testenv:py27-trunk]
 basepython=python2.7
 deps=
   https://github.com/django/django/tarball/master
-  South==0.7.3
+  South==0.7.6