Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
dist: xenial
language: python
python: "3.6"
python: 3.7
sudo: false
cache: pip
env:
- TOXENV=py27-django111
- TOXENV=py34-django111
- TOXENV=py35-django111
- TOXENV=py36-django111
- TOXENV=py34-django20
- TOXENV=py35-django20
- TOXENV=py36-django20
- TOXENV=py35-django21
- TOXENV=py36-django21
- TOXENV=docs
- TOXENV=lint
matrix:
include:
- python: "3.5"
- python: 2.7
env: TOXENV=py27-django111
- python: 3.4
env: TOXENV=py34-django111
- python: 3.5
env: TOXENV=py35-django111
- python: "3.5"
- python: 3.6
env: TOXENV=py36-django111
- python: 3.7
env: TOXENV=py37-django111
- python: 3.4
env: TOXENV=py34-django20
- python: 3.5
env: TOXENV=py35-django20
- python: "3.5"
env: TOXENV=py35-django21
exclude:
- python: "3.6"
env: TOXENV=py35-django111
- python: "3.6"
env: TOXENV=py35-django20
- python: "3.6"
- python: 3.6
env: TOXENV=py36-django20
- python: 3.7
env: TOXENV=py37-django20
- python: 3.5
env: TOXENV=py35-django21
- python: 3.6
env: TOXENV=py36-django21
- python: 3.7
env: TOXENV=py37-django21
- python: 3.5
env: TOXENV=py35-django22
- python: 3.6
env: TOXENV=py36-django22
- python: 3.7
env: TOXENV=py37-django22
install:
- pip install tox
script:
Expand Down
87 changes: 87 additions & 0 deletions password_reset/tests/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# Generated by Django 3.0.dev20190125164321 on 2019-01-25 21:49

import django.contrib.auth.models
import django.contrib.auth.validators
from django.db import migrations, models
import django.db.models.manager
import django.utils.timezone


class Migration(migrations.Migration):

initial = True

dependencies = [
('auth', '0008_alter_user_username_max_length'),
]

operations = [
migrations.CreateModel(
name='CustomUser',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('email', models.EmailField(max_length=255, unique=True, verbose_name='email address')),
('is_active', models.BooleanField(default=True)),
('is_admin', models.BooleanField(default=False)),
('date_of_birth', models.DateField()),
],
options={
'abstract': False,
},
managers=[
('custom_objects', django.db.models.manager.Manager()),
],
),
migrations.CreateModel(
name='ExtensionUser',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('is_superuser', models.BooleanField(
default=False,
help_text='Designates that this user has all permissions without explicitly assigning them.',
verbose_name='superuser status',
)),
('username', models.CharField(
error_messages={'unique': 'A user with that username already exists.'},
help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.',
max_length=150,
unique=True,
validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
verbose_name='username',
)),
('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
('is_staff', models.BooleanField(
default=False,
help_text='Designates whether the user can log into this admin site.',
verbose_name='staff status',
)),
('is_active', models.BooleanField(
default=True,
help_text=(
'Designates whether this user should be treated as '
'active. Unselect this instead of deleting accounts.'
),
verbose_name='active',
)),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('date_of_birth', models.DateField()),
('groups', models.ManyToManyField(blank=True, to='auth.Group')),
('user_permissions', models.ManyToManyField(blank=True, to='auth.Permission')),
],
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
'abstract': False,
},
managers=[
('custom_objects', django.contrib.auth.models.UserManager()),
('objects', django.contrib.auth.models.UserManager()),
],
),
]
Empty file.
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[flake8]
max-line-length=119

[wheel]
universal = 1
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Framework :: Django :: 2.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
Expand Down
11 changes: 7 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
envlist =
py27-django111,
py34-django{111,20},
py35-django{111,20,21},
py36-django{111,20,21},
py35-django{111,20,21,22},
py36-django{111,20,21,22},
py37-django{111,20,21,22},
docs, lint

[testenv]
Expand All @@ -13,13 +14,15 @@ basepython =
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2a1,<3.0

[testenv:docs]
basepython = python3.6
basepython = python3.7
changedir = docs
deps =
Sphinx
Expand All @@ -28,7 +31,7 @@ commands =
sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

[testenv:lint]
basepython = python3.6
basepython = python3.7
deps =
flake8
commands =
Expand Down