Merge pull request #226 from PetrDlouhy/master

Test in development Django version (with allow failures)
fix_request_path_info
Diederik van der Boor 2016-07-08 12:08:46 +02:00 committed by GitHub
commit 426107dde4
2 changed files with 46 additions and 27 deletions

View File

@ -7,51 +7,56 @@ python:
- "3.4" - "3.4"
- "3.5" - "3.5"
env: env:
- DJANGO=">=1.4,<1.5" - DJANGO="Django>=1.4,<1.5"
- DJANGO=">=1.5,<1.6" - DJANGO="Django>=1.5,<1.6"
- DJANGO=">=1.6,<1.7" - DJANGO="Django>=1.6,<1.7"
- DJANGO=">=1.7,<1.8" - DJANGO="Django>=1.7,<1.8"
- DJANGO=">=1.8,<1.9" - DJANGO="Django>=1.8,<1.9"
- DJANGO=">=1.9,<1.10" - DJANGO="Django>=1.9,<1.10"
- DJANGO="https://github.com/django/django/tarball/master"
matrix: matrix:
exclude: exclude:
- python: "3.5" - python: "3.5"
env: DJANGO=">=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.5" - python: "3.5"
env: DJANGO=">=1.5,<1.6" env: DJANGO="Django>=1.5,<1.6"
- python: "3.5" - python: "3.5"
env: DJANGO=">=1.6,<1.7" env: DJANGO="Django>=1.6,<1.7"
- python: "3.5" - python: "3.5"
env: DJANGO=">=1.7,<1.8" env: DJANGO="Django>=1.7,<1.8"
- python: "3.4" - python: "3.4"
env: DJANGO=">=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.4" - python: "3.4"
env: DJANGO=">=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "3.3" - python: "3.3"
env: DJANGO=">=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.3" - python: "3.3"
env: DJANGO=">=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "3.2" - python: "3.2"
env: DJANGO=">=1.4,<1.5" env: DJANGO="Django>=1.4,<1.5"
- python: "3.2" - python: "3.2"
env: DJANGO=">=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "2.6" - python: "2.6"
env: DJANGO=">=1.7,<1.8" env: DJANGO="Django>=1.7,<1.8"
- python: "2.6" - python: "2.6"
env: DJANGO=">=1.8,<1.9" env: DJANGO="Django>=1.8,<1.9"
- python: "2.6" - python: "2.6"
env: DJANGO=">=1.9,<1.10" env: DJANGO="Django>=1.9,<1.10"
- python: "2.6"
env: DJANGO="https://github.com/django/django/tarball/master"
allow_failures:
- env: DJANGO="https://github.com/django/django/tarball/master"
before_install: before_install:
- pip install codecov - pip install codecov
install: install:
- pip install django$DJANGO coverage==3.6 - pip install -q $DJANGO coverage==3.6
script: script:
- coverage run --source=polymorphic runtests.py - coverage run --source=polymorphic runtests.py

View File

@ -18,6 +18,16 @@ sys.stderr.write('Using Django version {0} from {1}\n'.format(
) )
if not settings.configured: if not settings.configured:
context_processors = [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request',
]
settings.configure( settings.configure(
DEBUG=True, DEBUG=True,
TEMPLATE_DEBUG=True, TEMPLATE_DEBUG=True,
@ -34,13 +44,17 @@ if not settings.configured:
TEMPLATE_LOADERS=( TEMPLATE_LOADERS=(
'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.Loader',
), ),
TEMPLATE_CONTEXT_PROCESSORS=( TEMPLATE_CONTEXT_PROCESSORS=context_processors,
# list() is only needed for older versions of django where this is TEMPLATES = [
# a tuple: {
list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'django.core.context_processors.request', 'DIRS': [],
] 'APP_DIRS': True,
), 'OPTIONS': {
'context_processors': context_processors,
},
},
],
TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1, 7) else 'django.test.simple.DjangoTestSuiteRunner', TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1, 7) else 'django.test.simple.DjangoTestSuiteRunner',
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',