Merge pull request #9 from crccheck/matrix

Increase testing coverage

Author: crccheck

.travis.yml

@@ -1,7 +1,10 @@
 language: python
 env:
-  - TOX_ENV=django14
-  - TOX_ENV=django15
-  - TOX_ENV=django16
+  - TOX_ENV=py26django14
+  - TOX_ENV=py26django15
+  - TOX_ENV=py27django14
+  - TOX_ENV=py27django15
+  - TOX_ENV=py27django16
+  - TOX_ENV=py33django16
 install: "pip install tox"
 script: tox -e $TOX_ENV

django_object_actions/utils.py

@@ -38,8 +38,8 @@ def to_dict(tool_name):
             """To represents the tool func as a dict with extra meta."""
             tool = getattr(self, tool_name)
             return dict(
-                name=x,
-                label=getattr(tool, 'label', x),
+                name=tool_name,
+                label=getattr(tool, 'label', tool_name),
                 short_description=getattr(tool, 'short_description', ''))
 
         context['objectactions'] = [to_dict(x) for x in self.objectactions]

setup.py

@@ -20,11 +20,15 @@
     description='A Django app for adding object tools to models',
     long_description=open('README.rst').read(),
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        'Development Status :: 4 - Beta',
         "Framework :: Django",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2",
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
     ],
 )

tox.ini

@@ -4,7 +4,14 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = django14,django15,django16
+envlist =
+    py26django14,
+    py27django14,
+    py26django15,
+    py27django15,
+    py27django16,
+    py33django16,
+
 downloadcache = {toxworkdir}/.cache
 
 [testenv]
@@ -14,17 +21,38 @@ deps =
     django-extensions>=0.9
     django-nose
 
-[testenv:django14]
+[testenv:py26django14]
+basepython=python2.6
 deps =
     {[testenv]deps}
     django>=1.4,>1.5
 
-[testenv:django15]
+[testenv:py26django15]
+basepython=python2.6
 deps =
     {[testenv]deps}
     django>=1.5,>1.6
 
-[testenv:django16]
+[testenv:py27django14]
+basepython=python2.7
+deps =
+    {[testenv]deps}
+    django>=1.4,>1.5
+
+[testenv:py27django15]
+basepython=python2.7
+deps =
+    {[testenv]deps}
+    django>=1.5,>1.6
+
+[testenv:py27django16]
+basepython=python2.7
+deps =
+    {[testenv]deps}
+    django>=1.6,>1.5
+
+[testenv:py33django16]
+basepython=python3.3
 deps =
     {[testenv]deps}
     django>=1.6,>1.5