mirrors/django-components
1
0
Fork 0
mirror of https://github.com/django-components/django-components.git synced 2025-11-26 17:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from EmilStenstrom/django17

Browse source 
Add support for Django 1.7.
This commit is contained in:
Emil Stenström 2015-06-22 22:40:11 +02:00
commit f1748a4d61
3 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -7,6 +7,6 @@ setup(
'Private :: Do Not Upload',
],
install_requires=[
'Django>=1.8'
'Django>=1.7'
],
)

23
tests/django_test_setup.py
View file

@ -2,11 +2,20 @@ import django
from django.conf import settings
if not settings.configured:
settings.configure(
INSTALLED_APPS=('django_components',),
TEMPLATES=[{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ["tests/templates/"],
}]
)
# Django 1.8 changes how you set up templates, so use different
# settings for different Django versions
if django.VERSION >= (1, 8):
settings.configure(
INSTALLED_APPS=('django_components',),
TEMPLATES=[{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': ["tests/templates/"],
}]
)
else:
settings.configure(
INSTALLED_APPS=('django_components',),
TEMPLATE_DIRS=["tests/templates/"],
)
django.setup()

9
tox.ini
View file

@ -1,8 +1,15 @@
[tox]
envlist = py{27,33,34}
envlist = py{27,33,34}-django{17,18}
[tox:travis]
2.7 = py27-django{17,18}
3.3 = py33-django{17,18}
3.4 = py34-django{17,18}
[testenv]
deps =
pytest
pytest-xdist
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
commands = py.test {posargs}