Skip to content
Permalink
Browse files

Merge pull request #951 from jchristgit/add-django-2-2

Add Django 2.2 to test matrix and support using Django 2.2 as a dependency.
  • Loading branch information...
benjaoming committed Jul 3, 2019
2 parents 1f6de54 + 6d15f80 commit 0fd6df920224d5dad39b09d585cf242bb6a54d13
Showing with 82 additions and 5 deletions.
  1. +14 −1 .travis.yml
  2. +2 −2 setup.py
  3. +63 −0 tests/testdata/migrations/0001_initial.py
  4. 0 tests/testdata/migrations/__init__.py
  5. +3 −2 tox.ini
@@ -1,4 +1,4 @@
cache: pip
#cache: pip

language: python

@@ -16,6 +16,10 @@ matrix:
dist: trusty
sudo: false
env: DJANGO="2.1"
- python: 3.5
dist: xenial
sudo: false
env: DJANGO="2.2"

- python: 3.6
dist: trusty
@@ -29,6 +33,10 @@ matrix:
dist: trusty
sudo: false
env: DJANGO="2.1"
- python: 3.6
dist: xenial
sudo: false
env: DJANGO="2.2"

- python: 3.7
dist: xenial
@@ -38,6 +46,10 @@ matrix:
dist: xenial
sudo: true
env: DJANGO="2.1"
- python: 3.7
dist: xenial
sudo: true
env: DJANGO="2.2"

- python: pypy
dist: trusty
@@ -54,6 +66,7 @@ install:
- pip install tox tox-travis codecov

script:
- python3 -c "import sqlite3;print(sqlite3.sqlite_version)"
- tox

notifications:
@@ -24,10 +24,10 @@ def get_path(fname):


install_requirements = [
"Django>=1.11,<2.2",
"Django>=1.11,<2.3",
"bleach>=2.1,<2.2",
"Pillow",
"django-nyt>=1.1.1,<1.2",
"django-nyt>=1.1.3,<1.2",
"django-mptt>=0.9,<0.10",
"django-sekizai>=0.10",
"sorl-thumbnail>=12,<13",
@@ -0,0 +1,63 @@
# Generated by Django 2.2.1 on 2019-07-03 19:03

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


class Migration(migrations.Migration):

initial = True

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

operations = [
migrations.CreateModel(
name='CustomGroup',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
],
),
migrations.CreateModel(
name='VeryCustomUser',
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')),
('identifier', models.IntegerField()),
],
options={
'abstract': False,
},
),
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')),
('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')),
('some_field', models.IntegerField(default=0)),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
],
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
'abstract': False,
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
]
No changes.
@@ -1,7 +1,6 @@
[tox]
# Ensure you add to .travis.yml if you add here, using `tox -l`
envlist = {py35,py36,py37}-django{111,20,21},lint

envlist = {py35,py36}-django{111,20,21,22},py37-django{20,21,22},lint

[travis]
python =
@@ -14,6 +13,7 @@ DJANGO =
1.11: django111
2.0: django20
2.1: django21
2.2: django22
LINT =
yes: lint

@@ -37,6 +37,7 @@ deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3

basepython =
py35: python3.5

0 comments on commit 0fd6df9

Please sign in to comment.
You can’t perform that action at this time.