Merge pull request #276 from rooterkyberian/more_testenvs

added py36 and Django 1.11 to test environments

Author: leportella

.travis.yml

@@ -7,13 +7,15 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
 
 env:
   - DJANGO="Django>=1.6,<1.7"
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
   - DJANGO="Django>=1.10,<1.11"
+  - DJANGO="Django>=1.11,<1.12"
 
 install:
   - pip install -U coverage codecov
@@ -30,9 +32,15 @@ matrix:
      env: DJANGO="Django>=1.6,<1.7"
    - python: 3.5
      env: DJANGO="Django>=1.7,<1.8"
+   - python: 3.6
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.6
+     env: DJANGO="Django>=1.7,<1.8"
    - python: 3.3
      env: DJANGO="Django>=1.9,<1.10"
    - python: 3.3
      env: DJANGO="Django>=1.10,<1.11"
+   - python: 3.3
+     env: DJANGO="Django>=1.11,<1.12"
 
 after_success: codecov

AUTHORS.rst

@@ -22,6 +22,7 @@ Authors
 - Jonathan Sanchez
 - Josh Fyne
 - Klaas van Schelven
+- Maciej "RooTer" Urbański
 - Martin Bachwerk
 - Marty Alchin
 - Mauricio de Abreu Antunes

runtests.py

@@ -27,6 +27,7 @@
 ]
 
 DEFAULT_SETTINGS = dict(
+    ALLOWED_HOSTS=['localhost'],
     AUTH_USER_MODEL='custom_user.CustomUser',
     ROOT_URLCONF='simple_history.tests.urls',
     MEDIA_ROOT=media_root,
@@ -45,6 +46,11 @@
     TEMPLATES=[{
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+            ]
+        },
     }],
 )
 

setup.py

@@ -30,6 +30,8 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         "License :: OSI Approved :: BSD License",
     ],
     tests_require=tests_require,

simple_history/tests/custom_user/admin.py

@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+
+from .models import CustomUser
+
+admin.site.register(CustomUser, UserAdmin)

simple_history/tests/custom_user/models.py

@@ -1,11 +1,7 @@
 from __future__ import unicode_literals
-from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
 
 from django.contrib.auth.models import AbstractUser
 
 
 class CustomUser(AbstractUser):
     pass
-
-admin.site.register(CustomUser, UserAdmin)

simple_history/tests/models.py

@@ -44,16 +44,20 @@ def _history_date(self):
 
 
 class Choice(models.Model):
-    poll = models.ForeignKey(Poll)
+    poll = models.ForeignKey(Poll, on_delete=models.CASCADE)
     choice = models.CharField(max_length=200)
     votes = models.IntegerField()
 
 register(Choice)
 
 
 class Voter(models.Model):
-    user = models.ForeignKey(User)
-    choice = models.ForeignKey(Choice, related_name='voters')
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    choice = models.ForeignKey(
+        Choice,
+        on_delete=models.CASCADE,
+        related_name='voters',
+    )
 
 
 class HistoricalRecordsVerbose(HistoricalRecords):
@@ -98,7 +102,11 @@ class FileModel(models.Model):
 
 
 class Document(models.Model):
-    changed_by = models.ForeignKey(User, null=True, blank=True)
+    changed_by = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        null=True, blank=True,
+    )
     history = HistoricalRecords()
 
     @property
@@ -119,11 +127,11 @@ class Profile(User):
 
 
 class AdminProfile(models.Model):
-    profile = models.ForeignKey(Profile)
+    profile = models.ForeignKey(Profile, on_delete=models.CASCADE)
 
 
 class State(models.Model):
-    library = models.ForeignKey('Library', null=True)
+    library = models.ForeignKey('Library', on_delete=models.CASCADE, null=True)
     history = HistoricalRecords()
 
 
@@ -137,11 +145,11 @@ class HardbackBook(Book):
 
 
 class Bookcase(models.Model):
-    books = models.ForeignKey(HardbackBook)
+    books = models.ForeignKey(HardbackBook, on_delete=models.CASCADE)
 
 
 class Library(models.Model):
-    book = models.ForeignKey(Book, null=True)
+    book = models.ForeignKey(Book, on_delete=models.CASCADE, null=True)
     history = HistoricalRecords()
 
     class Meta:
@@ -177,11 +185,11 @@ class ConcreteUtil(AbstractBase):
 
 
 class MultiOneToOne(models.Model):
-    fk = models.ForeignKey(SecondLevelInheritedModel)
+    fk = models.ForeignKey(SecondLevelInheritedModel, on_delete=models.CASCADE)
 
 
 class SelfFK(models.Model):
-    fk = models.ForeignKey('self', null=True)
+    fk = models.ForeignKey('self', on_delete=models.CASCADE, null=True)
     history = HistoricalRecords()
 
 
@@ -212,7 +220,7 @@ class Meta:
 
 
 class CustomFKError(models.Model):
-    fk = models.ForeignKey(SecondLevelInheritedModel)
+    fk = models.ForeignKey(SecondLevelInheritedModel, on_delete=models.CASCADE)
     history = HistoricalRecords()
 
 
@@ -223,7 +231,11 @@ class Series(models.Model):
 
 
 class SeriesWork(models.Model):
-    series = models.ForeignKey('Series', related_name='works')
+    series = models.ForeignKey(
+        'Series',
+        on_delete=models.CASCADE,
+        related_name='works',
+    )
     title = models.CharField(max_length=100)
     history = HistoricalRecords()
 
@@ -232,7 +244,11 @@ class Meta:
 
 
 class PollInfo(models.Model):
-    poll = models.ForeignKey(Poll, primary_key=True)
+    poll = models.ForeignKey(
+        Poll,
+        on_delete=models.CASCADE,
+        primary_key=True,
+    )
     history = HistoricalRecords()
 
 
@@ -254,12 +270,20 @@ class Country(models.Model):
 
 
 class Province(models.Model):
-    country = models.ForeignKey(Country, to_field='code')
+    country = models.ForeignKey(
+        Country,
+        on_delete=models.CASCADE,
+        to_field='code',
+    )
     history = HistoricalRecords()
 
 
 class City(models.Model):
-    country = models.ForeignKey(Country, db_column='countryCode')
+    country = models.ForeignKey(
+        Country,
+        on_delete=models.CASCADE,
+        db_column='countryCode',
+    )
     history = HistoricalRecords()
 
 

tox.ini

@@ -4,8 +4,9 @@ envlist =
     py{27,33,34}-django17,
     py{27,33,34,35}-django18,
     py{27,34,35}-django19,
-    py{27,34,35}-django110,
-    py{27,34,35}-djangotrunk,
+    py{27,34,35,36}-django110,
+    py{27,34,35,36}-django111,
+    py{35,36}-djangotrunk,
     docs, flake8
 
 
@@ -35,6 +36,7 @@ deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<1.12
     djangotrunk: https://github.com/django/django/tarball/master
 commands =
     coverage run -a --branch setup.py test