Merge branch 'release/v0.9.7'

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
     - 2.7
-    - 3.3
     - 3.4
     - 3.5
 install:

CHANGELOG.rst

@@ -4,6 +4,13 @@ History
 -------
 
 
+0.9.7 (2015-12-10)
+------------------
+
+* fix test suit + remove python3.3 support (Django 1.9)
+* demoproject: update your urlpatterns to be a list of django.conf.urls.url() instances instead
+
+
 0.9.4 (2015-10-28)
 ------------------
 

demoproject/demoproject/urls.py

@@ -1,30 +1,21 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+from . import views
 
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
 
-urlpatterns = patterns('demoproject.views',
-    # Examples:
-    url(r'^$', 'home', name='home'),
-    url(r'^piechart/', 'demo_piechart', name='demo_piechart'),
-    url(r'^linechart/', 'demo_linechart', name='demo_linechart'),
-    url(r'^linechart_without_date/', 'demo_linechart_without_date', name='demo_linechart_without_date'),
-    url(r'^linewithfocuschart/', 'demo_linewithfocuschart', name='demo_linewithfocuschart'),
-    url(r'^multibarchart/', 'demo_multibarchart', name='demo_multibarchart'),
-    url(r'^stackedareachart/', 'demo_stackedareachart', name='demo_stackedareachart'),
-    url(r'^multibarhorizontalchart/', 'demo_multibarhorizontalchart', name='demo_multibarhorizontalchart'),
-    url(r'^lineplusbarchart/', 'demo_lineplusbarchart', name='demo_lineplusbarchart'),
-    url(r'^cumulativelinechart/', 'demo_cumulativelinechart', name='demo_cumulativelinechart'),
-    url(r'^discretebarchart/', 'demo_discretebarchart', name='demo_discretebarchart'),
-    url(r'^discretebarchart_with_date/', 'demo_discretebarchart_with_date', name='demo_discretebarchart_date'),
-    url(r'^scatterchart/', 'demo_scatterchart', name='demo_scatterchart'),
-    url(r'^linechart_with_ampm/', 'demo_linechart_with_ampm', name='demo_linechart_with_ampm'),
+urlpatterns = [
+    url(r'^$', views.home, name='home'),
+    url(r'^piechart/', views.demo_piechart, name='demo_piechart'),
+    url(r'^linechart/', views.demo_linechart, name='demo_linechart'),
+    url(r'^linechart_without_date/', views.demo_linechart_without_date, name='demo_linechart_without_date'),
+    url(r'^linewithfocuschart/', views.demo_linewithfocuschart, name='demo_linewithfocuschart'),
+    url(r'^multibarchart/', views.demo_multibarchart, name='demo_multibarchart'),
+    url(r'^stackedareachart/', views.demo_stackedareachart, name='demo_stackedareachart'),
+    url(r'^multibarhorizontalchart/', views.demo_multibarhorizontalchart, name='demo_multibarhorizontalchart'),
+    url(r'^lineplusbarchart/', views.demo_lineplusbarchart, name='demo_lineplusbarchart'),
+    url(r'^cumulativelinechart/', views.demo_cumulativelinechart, name='demo_cumulativelinechart'),
+    url(r'^discretebarchart/', views.demo_discretebarchart, name='demo_discretebarchart'),
+    url(r'^discretebarchart_with_date/', views.demo_discretebarchart_with_date, name='demo_discretebarchart_date'),
+    url(r'^scatterchart/', views.demo_scatterchart, name='demo_scatterchart'),
+    url(r'^linechart_with_ampm/', views.demo_linechart_with_ampm, name='demo_linechart_with_ampm'),
     # url(r'^demoproject/', include('demoproject.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
-)
+]

django_nvd3/__init__.py

@@ -9,7 +9,7 @@
 Project location : https://github.com/areski/django-nvd3
 """
 
-__version__ = '0.9.6'  # edit also docs/source/conf.py and update requirements.txt
+__version__ = '0.9.7'  # edit also docs/source/conf.py and update requirements.txt
 __author__ = "Areski Belaid"
 __contact__ = "[email protected]"
 __homepage__ = "https://areskibelaid.com/"

docs/source/conf.py

@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.6'
+version = '0.9.7'
 # The full version, including alpha/beta/rc tags.
 #release = '0.6.1'
 release = version

tests/test_template_tags.py

@@ -1,28 +1,25 @@
 import unittest
 
+
+import django
 from django.template import (
     Context,
     Template
 )
 from django.conf import settings
 settings.configure()
+django.setup()
 from django.test.utils import override_settings
 try:
-    # django < 1.7
-    from django.template import loader
-    add_to_builtins = loader.add_to_builtins
-except AttributeError:
-    try:
-        # django >= 1.7
-        from django.template.base import add_to_builtins
-    except ImportError:
-        # django >= 1.9
-        def add_to_builtins(module):
-            from django.template.engine import Engine
-            template_engine = Engine.get_default()
-            template_engine.builtins.append(module)
-            template_engine.template_builtins = \
-                template_engine.get_template_builtins(template_engine.builtins)
+    from django.template.base import add_to_builtins
+except ImportError:
+    # django >= 1.9
+    def add_to_builtins(module):
+        from django.template.engine import Engine
+        template_engine = Engine.get_default()
+        template_engine.builtins.append(module)
+        template_engine.template_builtins = \
+            template_engine.get_template_builtins(template_engine.builtins)
 
 from django_nvd3.templatetags.nvd3_tags import load_chart, include_container