Skip to content

Commit 9c79f55

Browse files
committed
Support for Django 1.10
refs #18
1 parent 6adf8ec commit 9c79f55

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ python: 2.7
33
env:
44
- TOX_ENV=py27-django18
55
- TOX_ENV=py27-django19
6+
- TOX_ENV=py27-django110
67
- TOX_ENV=py34-django18
78
- TOX_ENV=py34-django19
9+
- TOX_ENV=py34-django110
810
- TOX_ENV=flake8
911
script: tox -e $TOX_ENV
1012
install:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## master (unreleased)
44

55
- Drop Django 1.6 and 1.7 support (#15).
6+
- Add Django 1.10 support (#18).
67

78
## 1.0.1 (2016-08-26)
89

demo/demo_chunkator/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
2+
import uuid
23
from django.db import models
3-
from uuidfield import UUIDField
44

55

66
class Book(models.Model):
@@ -9,5 +9,5 @@ class Book(models.Model):
99

1010

1111
class User(models.Model):
12-
uuid = UUIDField(auto=True, primary_key=True, hyphenate=True)
12+
uuid = models.UUIDField(default=uuid.uuid4, primary_key=True)
1313
name = models.CharField(max_length=100)

demo/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
REQUIREMENTS = [
1313
'django',
1414
'django-chunkator',
15-
'django-uuidfield'
1615
]
1716
AUTHOR = u'Novapost'
1817
EMAIL = u'rd@novapost.fr'

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[tox]
2-
envlist = {py27,py34}-django{18,19},flake8
2+
envlist = {py27,py34}-django{18,19,110},flake8
33

44
[testenv]
55
usedevelop = True
66
deps =
77
django18: Django>=1.8,<1.9
88
django19: Django>=1.9,<1.10
9+
django110: Django>=1.10,<1.11
910
flake8: flake8
1011
commands =
1112
python --version

0 commit comments

Comments
 (0)