Skip to content

Commit 26bf821

Browse files
committed
Add testing for Django 2.2
1 parent 74bb4b4 commit 26bf821

File tree

6 files changed

+101
-3
lines changed

6 files changed

+101
-3
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ matrix:
3232
env: TOXENV=py36-django21
3333
- python: 3.7
3434
env: TOXENV=py37-django21
35+
- python: 3.5
36+
env: TOXENV=py35-django22
37+
- python: 3.6
38+
env: TOXENV=py36-django22
39+
- python: 3.7
40+
env: TOXENV=py37-django22
3541
install:
3642
- pip install tox
3743
script:
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Generated by Django 3.0.dev20190125164321 on 2019-01-25 21:49
2+
3+
import django.contrib.auth.models
4+
import django.contrib.auth.validators
5+
from django.db import migrations, models
6+
import django.db.models.manager
7+
import django.utils.timezone
8+
9+
10+
class Migration(migrations.Migration):
11+
12+
initial = True
13+
14+
dependencies = [
15+
('auth', '0008_alter_user_username_max_length'),
16+
]
17+
18+
operations = [
19+
migrations.CreateModel(
20+
name='CustomUser',
21+
fields=[
22+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
23+
('password', models.CharField(max_length=128, verbose_name='password')),
24+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
25+
('email', models.EmailField(max_length=255, unique=True, verbose_name='email address')),
26+
('is_active', models.BooleanField(default=True)),
27+
('is_admin', models.BooleanField(default=False)),
28+
('date_of_birth', models.DateField()),
29+
],
30+
options={
31+
'abstract': False,
32+
},
33+
managers=[
34+
('custom_objects', django.db.models.manager.Manager()),
35+
],
36+
),
37+
migrations.CreateModel(
38+
name='ExtensionUser',
39+
fields=[
40+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
41+
('password', models.CharField(max_length=128, verbose_name='password')),
42+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
43+
('is_superuser', models.BooleanField(
44+
default=False,
45+
help_text='Designates that this user has all permissions without explicitly assigning them.',
46+
verbose_name='superuser status',
47+
)),
48+
('username', models.CharField(
49+
error_messages={'unique': 'A user with that username already exists.'},
50+
help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.',
51+
max_length=150,
52+
unique=True,
53+
validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
54+
verbose_name='username',
55+
)),
56+
('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
57+
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
58+
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
59+
('is_staff', models.BooleanField(
60+
default=False,
61+
help_text='Designates whether the user can log into this admin site.',
62+
verbose_name='staff status',
63+
)),
64+
('is_active', models.BooleanField(
65+
default=True,
66+
help_text=(
67+
'Designates whether this user should be treated as '
68+
'active. Unselect this instead of deleting accounts.'
69+
),
70+
verbose_name='active',
71+
)),
72+
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
73+
('date_of_birth', models.DateField()),
74+
('groups', models.ManyToManyField(blank=True, to='auth.Group')),
75+
('user_permissions', models.ManyToManyField(blank=True, to='auth.Permission')),
76+
],
77+
options={
78+
'verbose_name': 'user',
79+
'verbose_name_plural': 'users',
80+
'abstract': False,
81+
},
82+
managers=[
83+
('custom_objects', django.contrib.auth.models.UserManager()),
84+
('objects', django.contrib.auth.models.UserManager()),
85+
],
86+
),
87+
]

password_reset/tests/migrations/__init__.py

Whitespace-only changes.

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
[flake8]
2+
max-line-length=119
3+
14
[wheel]
25
universal = 1

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
'Framework :: Django :: 1.11',
2929
'Framework :: Django :: 2.0',
3030
'Framework :: Django :: 2.1',
31+
'Framework :: Django :: 2.2',
3132
'Intended Audience :: Developers',
3233
'License :: OSI Approved :: BSD License',
3334
'Natural Language :: English',

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
envlist =
33
py27-django111,
44
py34-django{111,20},
5-
py35-django{111,20,21},
6-
py36-django{111,20,21},
7-
py37-django{111,20,21},
5+
py35-django{111,20,21,22},
6+
py36-django{111,20,21,22},
7+
py37-django{111,20,21,22},
88
docs, lint
99

1010
[testenv]
@@ -19,6 +19,7 @@ deps =
1919
django111: Django>=1.11,<2.0
2020
django20: Django>=2.0,<2.1
2121
django21: Django>=2.1,<2.2
22+
django22: Django>=2.2a1,<3.0
2223

2324
[testenv:docs]
2425
basepython = python3.7

0 commit comments

Comments
 (0)