Merge branch 'release/1.3'

* release/1.3:
  bump v1.3
  update CHANGES
  tox.ini: do not install postgis if not  required
  update docs
  - Document new setting  - Fix loaddata test to pass without disabling concurrency  - Remove loaddata test that disable concurrency (now redundant)
  - fixes #36
  add default value to ConcurrencyOptions.initial
  add explicit mention to MIT license
  open 1.3 alpha

Author: saxix

.gitignore

@@ -9,6 +9,7 @@ coverage.xml
 .cache
 notes.txt
 docs/build/
+__pycache__
 /dist
 /build
 /MANIFEST

CHANGES

@@ -1,3 +1,12 @@
+Release 1.3 (15 Jul 2016)
+-------------------------
+* drop support for Python < 3.3
+* add support Django>=1.10
+* change license
+* fixes :issue:`36`. (thanks claytondaley)
+* new :setting:`IGNORE_DEFAULT` to ignore default version number
+
+
 Release 1.2 (05 Apr 2016)
 -------------------------
 * better support for django 1.9 ( ``TemplateDoesNotExist`` is now in ``django.template.exceptions``

LICENSE

@@ -1,20 +1,24 @@
-* Copyright (c) 2010, Stefano Apostolico ([email protected])
-* Dual licensed under the MIT or GPL Version 2 licenses.
+MIT License
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Copyright (c) 2010-2016, Stefano Apostolico ([email protected])
 
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
+Any use in a commercial product must be notified to the author by email
+indicating company name and product name
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

MANIFEST.in

@@ -10,8 +10,11 @@ include *.py
 exclude Makefile
 exclude .editorconfig
 exclude .tx
+exclude .pyc
 
 recursive-exclude .tx *
+recursive-exclude __pycache__ *
+recursive-exclude . *.pyc
 
 recursive-include docs *
 recursive-include src *

docs/conf.py

@@ -87,7 +87,7 @@
 version = ".".join(map(str, concurrency.VERSION[0:2]))
 # The full version, including alpha/beta/rc tags.
 release = concurrency.get_version()
-next_version = '1.0.1'
+next_version = '1.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/settings.rst

@@ -92,6 +92,21 @@ Default: ``CONCURRENCY_LIST_EDITABLE_POLICY_SILENT``
 
 .. _list_editable_policies:
 
+.. setting:: CONCURRENCY_IGNORE_DEFAULT
+
+IGNORE_DEFAULT
+--------------
+.. versionadded:: >1.2
+
+Default: ``True``
+
+Determines whether a default version number is ignored or used in a concurrency check.  While this
+configuration defaults to True for backwards compatibility, this setting can cause omitted version
+numbers to pass concurrency checks. New implementations are recommended to set this to ``False``.
+
+.. note:: For security reasons, starting from version 1.5, default value will be ``False``.
+
+
 ``CONCURRENCY_LIST_EDITABLE_POLICY_SILENT``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Used by admin's integrations to handle ``list_editable`` conflicts.

setup.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
+import imp
 import os
 import sys
-import imp
-from distutils import log
-from distutils.command.clean import clean as CleanCommand
-from distutils.dir_util import remove_tree
 
 from setuptools import find_packages, setup
 from setuptools.command.test import test as TestCommand
@@ -58,7 +55,7 @@ def run_tests(self):
     long_description=open('README.rst').read(),
     license='MIT License',
     keywords='django',
-    setup_requires=['pytest-runner',],
+    setup_requires=['pytest-runner', ],
     install_requires=install_requires,
     tests_require='django\n' + test_requires,
     extras_require={'test': test_requires,

src/concurrency/__init__.py

@@ -5,7 +5,7 @@
 __author__ = 'sax'
 default_app_config = 'concurrency.apps.ConcurrencyConfig'
 
-VERSION = __version__ = (1, 2, 0, 'final', 0)
+VERSION = __version__ = (1, 3, 0, 'final', 0)
 NAME = 'django-concurrency'
 
 

src/concurrency/admin.py

@@ -16,7 +16,7 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils.encoding import force_text
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _, ungettext
+from django.utils.translation import ungettext
 
 from concurrency import core, forms
 from concurrency.api import get_revision_of_object

src/concurrency/config.py

@@ -50,7 +50,9 @@ class AppSettings(object):
         'FIELD_SIGNER': 'concurrency.forms.VersionFieldSigner',
         'POLICY': CONCURRENCY_LIST_EDITABLE_POLICY_SILENT,
         'CALLBACK': 'concurrency.views.callback',
-        'HANDLER409': 'concurrency.views.conflict'}
+        'HANDLER409': 'concurrency.views.conflict',
+        'IGNORE_DEFAULT': True,
+    }
 
     def __init__(self, prefix):
         """