Merge 69c896c into 95339f7

.travis.yml

@@ -1,11 +1,16 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
 env:
   - DJANGO=1.7
   - DJANGO=1.8
+  - DJANGO=1.9
+matrix:
+  exclude:
+   - python: "3.5"
+     env: DJANGO=1.7
 install:
   - pip install -q Django==$DJANGO
   - pip install coverage

django_seed/tests.py

@@ -7,7 +7,10 @@
 import django
 
 from django.db import models
-from django.utils import unittest
+try:
+    from django.utils.unittest import TestCase
+except:
+    from django.test import TestCase
 from django.core.management import call_command
 
 
@@ -59,7 +62,7 @@ class Action(models.Model):
     target = models.ForeignKey(Player, related_name='enemy_actions+', null=True)
 
 
-class SeederTestCase(unittest.TestCase):
+class SeederTestCase(TestCase):
 
     def test_population(self):
         faker = fake
@@ -144,7 +147,7 @@ def test_no_entities_added(self):
             self.assertTrue(isinstance(e, SeederException))
 
 
-class APISeedTestCase(unittest.TestCase):
+class APISeedTestCase(TestCase):
 
     def setUp(self):
         self.seed1 = Seed()
@@ -181,7 +184,7 @@ def test_faker_cache_seeder(self):
         self.assertIs(seeder1, seeder2)
 
 
-class SeedCommandTestCase(unittest.TestCase):
+class SeedCommandTestCase(TestCase):
 
     def test_seed_command(self):
         call_command('seed', 'django_seed', number=10)

setup.py

@@ -48,8 +48,8 @@ def find_version(*file_paths):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Testing',
         'Topic :: Utilities',