Skip to content

Django 1.10 support. #4158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 14 commits into from
Jun 1, 2016
Merged

Django 1.10 support. #4158

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b0894ed
Added TEMPLATES setting to tests
lovelydinosaur Jun 1, 2016
1a2b325
Remove deprecated view-string in URL conf
lovelydinosaur Jun 1, 2016
f11e24e
Replace 'urls = ...' in test classes with override_settings('ROOT_URL…
lovelydinosaur Jun 1, 2016
9c83ff4
Refactor UsingURLPatterns to use override_settings(ROOT_URLCONF=...) …
lovelydinosaur Jun 1, 2016
96aaa24
Get model managers and names in a version-compatible manner.
lovelydinosaur Jun 1, 2016
46f2ec4
Apply override_settings to a TestCase, not a mixin class
lovelydinosaur Jun 1, 2016
9d1ee6f
Use '.callback' property instead of private attributes when inspectin…
lovelydinosaur Jun 1, 2016
437a125
Pass 'user' to template explicitly
lovelydinosaur Jun 1, 2016
c65c5e4
Correct sorting of import statements.
lovelydinosaur Jun 1, 2016
7ece633
Remove unused TEMPLATE_LOADERS setting, in favor of TEMPLATES.
lovelydinosaur Jun 1, 2016
0ab1aeb
Remove code style issue
lovelydinosaur Jun 1, 2016
b593194
BaseFilter test requires a concrete model
lovelydinosaur Jun 1, 2016
3bdbfdb
Resolve tox.ini issues
lovelydinosaur Jun 1, 2016
3a808a0
Resolve isort differences between local and tox environments
lovelydinosaur Jun 1, 2016
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
Prev Previous commit
Next Next commit
Remove unused TEMPLATE_LOADERS setting, in favor of TEMPLATES.
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Jun 1, 2016
commit 7ece6338313925d0ef673c09e408d7bc302b832c
13 changes: 6 additions & 7 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ def pytest_configure():

settings.configure(
DEBUG_PROPAGATE_EXCEPTIONS=True,
DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3',
'NAME': ':memory:'}},
DATABASES={
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ':memory:'
}
},
SITE_ID=1,
SECRET_KEY='not very secret in tests',
USE_I18N=True,
USE_L10N=True,
STATIC_URL='/static/',
ROOT_URLCONF='tests.urls',
TEMPLATE_LOADERS=(
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
),
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
Expand All @@ -33,7 +33,6 @@ def pytest_configure():
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.staticfiles',

'rest_framework',
'rest_framework.authtoken',
'tests',
Expand Down