Permalink
Browse files

Django 1.5 support

  • Loading branch information...
1 parent 73f1d31 commit b671f83b30b9d299660c22f755d00ed88fcb8b07 @zbyte64 committed Mar 27, 2013
Showing with 30 additions and 1 deletion.
  1. +12 −0 dockit/schema/loading.py
  2. +1 −1 tests/test_settings.py
  3. +17 −0 tox.ini
View
12 dockit/schema/loading.py
@@ -7,6 +7,18 @@
from dockit.schema.signals import document_registered
class DockitAppCache(AppCache):
+ def __init__(self):
+ super(DockitAppCache, self).__init__()
+ if not hasattr(self, 'write_lock'):
+ import imp
+ class WriteLock(object):
+ def acquire(self):
+ imp.acquire_lock()
+
+ def release(self):
+ imp.release_lock()
+ self.write_lock = WriteLock()
+
def register_documents(self, app_label, *documents):
document_dict = self.app_documents.setdefault(app_label, SortedDict())
for document in documents:
View
2 tests/test_settings.py
@@ -85,7 +85,7 @@
)
# Make this unique, and don't share it with anybody.
-SECRET_KEY = ''
+SECRET_KEY = 'NOTASECRET'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
View
17 tox.ini
@@ -9,10 +9,12 @@ envlist =
py26_django14,
py27_django13,
py27_django14,
+ py27_django15,
py26_django13_celery,
py26_django14_celery,
py27_django13_celery,
py27_django14_celery,
+ py27_django15_celery,
#py26_django13_ztask,
#py26_django14_ztask,
#py27_django13_ztask,
@@ -50,6 +52,12 @@ deps =
Django>=1.4, <1.5
-r{toxinidir}/requirements.txt
+[testenv:py27_django15]
+basepython = python2.7
+deps =
+ Django>=1.5, <1.6
+ -r{toxinidir}/requirements.txt
+
[testenv:py26_django13_celery]
@@ -88,6 +96,15 @@ deps =
setenv =
TASK_BACKEND = celery
+[testenv:py27_django15_celery]
+basepython = python2.7
+deps =
+ Django>=1.5, <1.6
+ django-celery
+ -r{toxinidir}/requirements.txt
+setenv =
+ TASK_BACKEND = celery
+
[testenv:py26_django13_ztask]
basepython = python2.6

0 comments on commit b671f83

Please sign in to comment.