Merge branch 'release/0.6b1'

saxix · Jul 15, 2013 · 76879e8 · 76879e8
2 parents 77b1f0f + 65691bd
commit 76879e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/concurrency/__init__.py b/concurrency/__init__.py
@@ -2,7 +2,7 @@
 import datetime
 import os
 
-VERSION = __version__ = (0, 6, 0, 'beta', 0)
+VERSION = __version__ = (0, 6, 0, 'beta', 1)
 __author__ = 'sax'
 
 

diff --git a/concurrency/config.py b/concurrency/config.py
@@ -46,6 +46,7 @@ class AppSettings(object):
 
     """
     defaults = {
+        'ENABLED': True,
         'SANITY_CHECK': True,
         'FIELD_SIGNER': 'concurrency.forms.VersionFieldSigner',
         'POLICY': CONCURRENCY_LIST_EDITABLE_POLICY_SILENT | CONCURRENCY_POLICY_RAISE,

diff --git a/concurrency/core.py b/concurrency/core.py
@@ -36,6 +36,8 @@ def _set_version(obj, version):
 
 
 def _select_lock(model_instance, version_value=None):
+    if not conf.ENABLED:
+        return
     version_field = model_instance.RevisionMetaInfo.field
     value = version_value or getattr(model_instance, version_field.name)
     is_versioned = value != version_field.get_default()

diff --git a/docs/conf.py b/docs/conf.py
@@ -77,9 +77,10 @@
 # built documents.
 #
 # The short X.Y version.
-version = concurrency.get_version()
+version = ".".join(map(str, app.VERSION[0:2]))
 # The full version, including alpha/beta/rc tags.
 release = concurrency.get_version()
+next_version = '0.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.