Skip to content

Commit

Permalink
restores support django>=1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
saxix committed Sep 9, 2018
1 parent 516a4f5 commit 04c7e0c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
3 changes: 1 addition & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Release 2.0 (dev)
-----------------
* drop official support to Django < 2.0
* drop official support to python 2.x
* drop official support to Django < 1.10
* add support Django 2.1
* removed deprecated api `concurrency_check`
* BACKWARD INCOMPATIBLE: version field is now mandatory in any save operation. Use ``VERSION_FIELD_REQUIRED=False`` to have the old behaviour.
Expand Down
11 changes: 6 additions & 5 deletions src/concurrency/compat.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, print_function, unicode_literals
import django

# try:
# if django.VERSION <(1,9):
# from django.template.base import TemplateDoesNotExist
# except ImportError:
# else:
from django.template.exceptions import TemplateDoesNotExist # noqa - django 1.9

# try:
from django.urls.utils import get_callable
# except ImportError:
# if django.VERSION <(1,9):
# from django.core.urlresolvers import get_callable # noqa
# else:
from django.urls.utils import get_callable
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[tox]
envlist = d{20,21}-py{35,36}-{pg,sqlite,mysql}
envlist = d{110,111}-py{27,35,36,py}-{pg,sqlite,mysql},
d{20,21}-py{35,36}-{pg,sqlite,mysql}


[pytest]
Expand Down Expand Up @@ -50,10 +51,13 @@ deps=
pytest-django
pytest-echo
pytest-pythonpath
py{34,35,36,37}-pg: psycopg2
py{27,34,35,36,37}-pg: psycopg2
pypy-pg: psycopg2cffi
mysql: mysqlclient
docs: -rdocs/requirements.pip
d110: django>=1.10,<1.11
d111: django>=1.11,<1.12
d20: django>=2.0,<2.1
d20: django>=2.0,<2.1
d21: django>=2.1,<2.2

Expand Down

0 comments on commit 04c7e0c

Please sign in to comment.