Skip to content

Commit

Permalink
Merge c04c31c into 7fa5c2d
Browse files Browse the repository at this point in the history
  • Loading branch information
palfrey committed Jun 14, 2020
2 parents 7fa5c2d + c04c31c commit 86769a4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
42 changes: 21 additions & 21 deletions .travis.yml
@@ -1,34 +1,34 @@
sudo: false
dist: bionic
os: linux
language: python
python:
- "2.7"
- "3.4"
- "3.7"
# All the other database configs are run in jobs, and just for Django 3.0/Python 3.7
env:
- DJANGO=1.11.* DJANGO_SETTINGS_MODULE='settings_sqllite'
- DJANGO=1.11.* DJANGO_SETTINGS_MODULE='settings_postgres'
- DJANGO=1.11.* DJANGO_SETTINGS_MODULE='settings_mysql'
- DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_sqllite'
- DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_postgres'
- DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_mysql'
addons:
- postgresql: "9.3"
- DJANGO=3.0.* DJANGO_SETTINGS_MODULE='settings_sqllite'
jobs:
include:
- python: "3.7"
env: DJANGO=3.0.* DJANGO_SETTINGS_MODULE='settings_postgres'
services:
- postgresql
before_script:
- psql -c 'create database travis_test;' -U postgres
- python: "3.7"
env: DJANGO=3.0.* DJANGO_SETTINGS_MODULE='settings_mysql'
services:
- mysql
before_script:
- mysql -e 'create database travis_test;'
install:
- pip install -q Django==$DJANGO
- pip install coveralls
- pip install -r test_requirements.pip
script:
- flake8 . --config=flake8
- coverage run --source=django_cron setup.py test
after_success:
- coveralls
before_script:
- mysql -e 'create database travis_test;'
- psql -c 'create database travis_test;' -U postgres
- flake8 . --config=flake8
matrix:
exclude:
- python: "2.7"
env: DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_sqllite'
- python: "2.7"
env: DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_postgres'
- python: "2.7"
env: DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_mysql'
- coveralls
4 changes: 3 additions & 1 deletion settings_base.py
Expand Up @@ -3,6 +3,7 @@
'django.contrib.auth',
'django.contrib.humanize',
'django.contrib.contenttypes',
'django.contrib.messages',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.sitemaps',
Expand All @@ -25,7 +26,8 @@

MIDDLEWARE = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware'
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware'
]

LOGGING = {
Expand Down

0 comments on commit 86769a4

Please sign in to comment.