Skip to content

Commit 8879320

Browse files
rpkilbyrpkilby
authored
Add Django 2.2 support (#300)
1 parent a4c73cc commit 8879320

File tree

5 files changed

+118
-6
lines changed

5 files changed

+118
-6
lines changed

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Requirements
5656
------------
5757

5858
* **Python**: 3.4, 3.5, 3.6, 3.7
59-
* **Django**: 1.11, 2.0, 2.1
59+
* **Django**: 1.11, 2.0, 2.1, 2.2
6060
* **DRF**: 3.9
6161
* **django-filter**: 2.0
6262

‎setup.cfg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include = rest_framework_filters/*
77
show_missing = True
88

99
[isort]
10-
skip = .tox
10+
skip = migrations
1111
atomic = true
1212
line_length=90
1313
include_trailing_comma = true
@@ -18,3 +18,4 @@ known_first_party = rest_framework_filters
1818
[flake8]
1919
max_line_length = 120
2020
max_complexity = 10
21+
exclude = migrations

‎tests/testapp/migrations/0001_initial.py‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# Generated by Django 2.2.2 on 2019-06-05 21:58
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
initial = True
11+
12+
dependencies = [
13+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14+
]
15+
16+
operations = [
17+
migrations.CreateModel(
18+
name='A',
19+
fields=[
20+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21+
('title', models.CharField(max_length=100)),
22+
],
23+
),
24+
migrations.CreateModel(
25+
name='Blog',
26+
fields=[
27+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
28+
('name', models.CharField(max_length=100)),
29+
],
30+
),
31+
migrations.CreateModel(
32+
name='Note',
33+
fields=[
34+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
35+
('title', models.CharField(max_length=100)),
36+
('content', models.TextField()),
37+
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
38+
],
39+
),
40+
migrations.CreateModel(
41+
name='Tag',
42+
fields=[
43+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
44+
('name', models.CharField(max_length=100)),
45+
],
46+
),
47+
migrations.CreateModel(
48+
name='Post',
49+
fields=[
50+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
51+
('title', models.CharField(max_length=100)),
52+
('content', models.TextField()),
53+
('publish_date', models.DateField(null=True)),
54+
('author', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
55+
('blog', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.Blog')),
56+
('note', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.Note')),
57+
('tags', models.ManyToManyField(to='testapp.Tag')),
58+
],
59+
),
60+
migrations.CreateModel(
61+
name='Person',
62+
fields=[
63+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
64+
('name', models.CharField(max_length=100)),
65+
('date_joined', models.DateField(auto_now_add=True)),
66+
('time_joined', models.TimeField(auto_now_add=True)),
67+
('datetime_joined', models.DateTimeField(auto_now_add=True)),
68+
('best_friend', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.Person')),
69+
],
70+
),
71+
migrations.CreateModel(
72+
name='Page',
73+
fields=[
74+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
75+
('title', models.CharField(max_length=100)),
76+
('content', models.TextField()),
77+
('previous_page', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.Page')),
78+
],
79+
),
80+
migrations.CreateModel(
81+
name='Cover',
82+
fields=[
83+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
84+
('comment', models.CharField(max_length=100)),
85+
('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='testapp.Post')),
86+
],
87+
),
88+
migrations.CreateModel(
89+
name='C',
90+
fields=[
91+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
92+
('title', models.CharField(max_length=100)),
93+
('a', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.A')),
94+
],
95+
),
96+
migrations.CreateModel(
97+
name='B',
98+
fields=[
99+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
100+
('name', models.CharField(max_length=100)),
101+
('c', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.C')),
102+
],
103+
),
104+
migrations.AddField(
105+
model_name='a',
106+
name='b',
107+
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='testapp.B'),
108+
),
109+
]

‎tests/testapp/migrations/__init__.py‎

Whitespace-only changes.

‎tox.ini‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ envlist =
33
py{34,35,36}-django111,
44
py{35,36,37}-django20,
55
py{35,36,37}-django21,
6+
py{35,36,37}-django22,
67
performance, warnings, isort, lint, dist,
78

89
[travis]
@@ -15,10 +16,11 @@ setenv =
1516
PYTHONDONTWRITEBYTECODE=1
1617
deps =
1718
coverage>=4.0
18-
djangorestframework~=3.9
19-
django111: django~=1.11
20-
django20: django~=2.0
21-
django21: django~=2.1
19+
djangorestframework~=3.9.0
20+
django111: django~=1.11.0
21+
django20: django~=2.0.0
22+
django21: django~=2.1.0
23+
django22: django~=2.2.0
2224

2325

2426
[testenv:performance]

0 commit comments

Comments
 (0)