Merge branch 'release/0.9'

* release/0.9:
  bump 0.9
  Squashed commit of the following:
  code clean and test refactoring
  add coveralls support
  updates README
  Squashed commit of the following:
  add unicode support to postgres backend
  updates CHANGES
  tests refactoring
  django 1.8 compatibility
  tests refactoring
  updates CHANGES
  fixes wrong pypi server in tox.ini
  merge #40 and fixes test suite
  Don't create triggers on abstract classes
  disable_concurrency() now accept instance or Model
  open 0.9
  better use to setuptools.
  updates docs. fixes #38

Author: saxix

.coveragerc

@@ -1,25 +1,68 @@
 language: python
+python:
+  - "2.7"
+  - "3.4"
+
+cache:
+  - pip
+
+sudo: false
+
 services:
   - MySQL
   - PostgreSQL
 
 env:
-  - TESTENV=p27d14pg
-  - TESTENV=p27d15pg
-  - TESTENV=p27d16pg
-  - TESTENV=p27d17pg
-  - TESTENV=p27dtrunkpg
-  - TESTENV=p33d16pg
-  - TESTENV=p27d16mysql
+  - DJANGO=1.4.x DBENGINE=pg
+  - DJANGO=1.5.x DBENGINE=pg
+  - DJANGO=1.6.x DBENGINE=pg
+  - DJANGO=1.7.x DBENGINE=pg
+  - DJANGO=1.8.x DBENGINE=pg
+  - DJANGO=dev DBENGINE=pg
 
+  - DJANGO=1.4.x DBENGINE=mysql
+  - DJANGO=1.5.x DBENGINE=mysql
+  - DJANGO=1.6.x DBENGINE=mysql
+  - DJANGO=1.7.x DBENGINE=mysql
+  - DJANGO=1.8.x DBENGINE=mysql
+  - DJANGO=dev DBENGINE=pg
 
 install:
-  - make install-deps
+  - pip install tox>=1.8
+  - pip install python-coveralls>=2.5 coveralls>=0.5
+
 
 script:
-  - make init-db
-  - tox -e $TESTENV
+  - make coverage
 
+before_success:
+  - coverage erase
 
 after_success:
+  - coverage combine
   - coveralls
+
+matrix:
+  allow_failures:
+    - env: DJANGO=dev DBENGINE=pg
+
+  exclude:
+    - python: "3.4"
+      env: DJANGO=1.4.x DBENGINE=pg
+    - python: "3.4"
+      env: DJANGO=1.5.x DBENGINE=pg
+    - python: "3.4"
+      env: DJANGO=1.6.x DBENGINE=pg
+
+    - python: "3.4"
+      env: DJANGO=1.4.x DBENGINE=mysql
+    - python: "3.4"
+      env: DJANGO=1.5.x DBENGINE=mysql
+    - python: "3.4"
+      env: DJANGO=1.6.x DBENGINE=mysql
+    - python: "3.4"
+      env: DJANGO=1.7.x DBENGINE=mysql
+    - python: "3.4"
+      env: DJANGO=1.8.x DBENGINE=mysql
+    - python: "3.4"
+      env: DJANGO=dev DBENGINE=mysql

.travis.yml

@@ -1,16 +1,26 @@
+Release 0.9
+-----------
+* django 1.8 compatibility
+* python 3.4 compatibility
+* **BACKWARD INCOMPATIBLE** :ref:`disable_concurrency` works differently if used with classes or instances
+* better support for external Models (models that are part of plugged-in applications)
+* fixes issue with TriggerVersioField and Proxy Models (thanx Richard Eames)
+
+
 Release 0.8.1
 -------------
 * avoid to use concurrency when selecting all items (select_across)
 
+
 Release 0.8
 -----------
 * django 1.7 compatibility
 * fixes typo in ``delete_selected_confirmation.html`` template
 * python 3.2/3.3 compatibility
 
+
 Release 0.7.1
 -------------
-
 * backward compatibility updates. Do not check for concurrency if `0` is passed as version value
     (ie. no value provided by the form)
 
@@ -25,9 +35,9 @@ Release 0.7
 * fixed :issue:`23` (thanks matklad)
 * new :setting:`USE_SELECT_FOR_UPDATE`
 
+
 Release 0.6.0
 -------------
-
 * new :ref:`disable_concurrency` context manager
 * added documentation for :ref:`concurrency.middleware.ConcurrencyMiddleware <concurrencymiddleware>`
 * **BACKWARD INCOMPATIBLE** Fixed typo: ``CONCURRECY_SANITY_CHECK`` now ``CONCURRENCY_SANITY_CHECK``
@@ -39,14 +49,12 @@ Release 0.6.0
 
 Release 0.5.0
 -------------
-
 * python 3.x compatibility
 * new :setting:`CONCURRENCY_FIELD_SIGNER`
 
 
 Release 0.4.0
 ---------------------------------
-
 * start deprecation of ``concurrency.core.VersionChangedError``, ``concurrency.core.RecordModifiedError``,
     ``concurrency.core.InconsistencyError``,moved in ``concurrency.exceptions``
 * start deprecation of ``concurrency.core.apply_concurrency_check``, ``concurrency.core.concurrency_check`` moved in ``concurrency.api``

CHANGES

@@ -1,59 +1,46 @@
 VERSION=2.0.0
 BUILDDIR='~build'
-PYTHONPATH := ${PWD}/demo/:${PWD}
+PYTHONPATH:=${PWD}/tests/:${PWD}
 DJANGO_14='django>=1.4,<1.5'
 DJANGO_15='django>=1.5,<1.6'
-DJANGO_16='django>=1.6,>1.7'
-DJANGO_17='https://www.djangoproject.com/download/1.7c1/tarball/'
+DJANGO_16='django>=1.6,<1.7'
+DJANGO_17='django>=1.7,<1.8'
+DJANGO_18='django>=1.8,<1.9'
 DJANGO_DEV=git+git://github.com/django/django.git
-DBENGINE?=pg
-
+DBENGINE?=sqlite
+DJANGO?='1.7.x'
 
 
 mkbuilddir:
 	mkdir -p ${BUILDDIR}
 
-
 install-deps:
-	pip install -q \
-	        -r requirements.pip python-coveralls \
-	        django_extensions
-
-
-locale:
-	cd concurrency && django-admin.py makemessages -l en
-	export PYTHONPATH=${PYTHONPATH}
-	cd concurrency && django-admin.py compilemessages --settings=${DJANGO_SETTINGS_MODULE}
+	@pip install "pip>=6.0.8"
+	@pip install -qr requirements/tests.pip
+	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then pip install  MySQL-python; fi"
+	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then pip install -q psycopg2; fi"
+	@sh -c "if [ '${DJANGO}' = '1.4.x' ]; then pip install ${DJANGO_14}; fi"
+	@sh -c "if [ '${DJANGO}' = '1.5.x' ]; then pip install ${DJANGO_15}; fi"
+	@sh -c "if [ '${DJANGO}' = '1.6.x' ]; then pip install ${DJANGO_16}; fi"
+	@sh -c "if [ '${DJANGO}' = '1.7.x' ]; then pip install ${DJANGO_17}; fi"
+	@sh -c "if [ '${DJANGO}' = '1.8.x' ]; then pip install ${DJANGO_18}; fi"
+	@sh -c "if [ '${DJANGO}' = 'dev' ]; then pip install ${DJANGO_DEV}; fi"
 
 
 init-db:
-	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS concurrency;'; fi"
-	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then pip install  MySQL-python; fi"
-	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS concurrency;'; fi"
+	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -u root -e 'DROP DATABASE IF EXISTS concurrency;'; fi"
+	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE IF NOT EXISTS concurrency;'; fi"
 
 	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'DROP DATABASE IF EXISTS concurrency;' -U postgres; fi"
 	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'CREATE DATABASE concurrency;' -U postgres; fi"
-	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then pip install -q psycopg2; fi"
-
 
 test:
-	py.test -vvv
+	py.test -v
 
 
-coverage: mkbuilddir
-	py.test --cov=concurrency --cov-report=html --cov-report=term --cov-config=.coveragerc -vvv
-
-
-ci: init-db install-deps
-	@sh -c "if [ '${DJANGO}' = '1.4.x' ]; then pip install ${DJANGO_14}; fi"
-	@sh -c "if [ '${DJANGO}' = '1.5.x' ]; then pip install ${DJANGO_15}; fi"
-	@sh -c "if [ '${DJANGO}' = '1.6.x' ]; then pip install ${DJANGO_16}; fi"
-	@sh -c "if [ '${DJANGO}' = '1.7.x' ]; then pip install ${DJANGO_17}; fi"
-	@sh -c "if [ '${DJANGO}' = 'dev' ]; then pip install ${DJANGO_DEV}; fi"
-	@pip install coverage
-	@python -c "from __future__ import print_function;import django;print('Django version:', django.get_version())"
-	@echo "Database:" ${DBENGINE}
-	$(MAKE) coverage
+coverage: mkbuilddir install-deps init-db
+	echo ${PYTHONPATH};
+	PYTHONPATH=${PWD}/tests/:${PWD} py.test tests -v --cov=concurrency --cov-report=html --cov-config=tests/.coveragerc -q
 
 
 clean:
@@ -62,10 +49,6 @@ clean:
 	find concurrency/locale -name django.mo | xargs rm -f
 
 
-clonedigger: mkbuilddir
-	-clonedigger concurrency -l python -o ${BUILDDIR}/clonedigger.html --fast
-
-
 docs: mkbuilddir
 	mkdir -p ${BUILDDIR}/docs
 	sphinx-build -aE docs/ ${BUILDDIR}/docs

Makefile

@@ -12,7 +12,7 @@ Django Concurrency
 
 django-concurrency is an optimistic lock [1]_ implementation for Django.
 
-Tested with: 1.4.x, 1.5.x, 1.6.x, 1.7 trunk.
+Tested with: 1.4.x, 1.5.x, 1.6.x, 1.7.x 1.8.x.
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.
@@ -43,7 +43,7 @@ Similar projects
 Other projects that handle concurrent editing are `django-optimistic-lock`_ and `django-locking`_ anyway concurrency is "a batteries included" optimistic lock management system, here some features not available elsewhere:
 
  * can be applied to any model; not only your code (ie. django.contrib.auth.Group)
- * works with django 1.4 and 1.5
+ * works with django 1.4-1.8
  * handle `list-editable`_ ChangeList. (handle `#11313 <https://code.djangoproject.com/ticket/11313>`_)
  * manage concurrency conflicts in admin's actions
  * can intercept changes performend out of the django app (ie using pgAdmin, phpMyAdmin, Toads) (using `TriggerVersionField_`

README.rst

@@ -2,7 +2,7 @@
 import datetime
 import os
 
-VERSION = __version__ = (0, 8, 1, 'final', 0)
+VERSION = __version__ = (0, 9, 0, 'final', 0)
 __author__ = 'sax'
 
 

concurrency/__init__.py

@@ -44,7 +44,7 @@ def action_checkbox(self, obj):
     def get_confirmation_template(self):
         return "concurrency/delete_selected_confirmation.html"
 
-    def response_action(self, request, queryset):
+    def response_action(self, request, queryset):  # noqa
         """
         Handle an admin action. This is called if a request is POSTed to the
         changelist; it returns an HttpResponse if the action was handled, and
@@ -93,7 +93,7 @@ def response_action(self, request, queryset):
 
             if self.check_concurrent_action:
                 self.delete_selected_confirmation_template = self.get_confirmation_template()
-                
+
                 # If select_across we have to avoid the use of concurrency
                 if selected is not ALL:
                     filters = []
@@ -114,8 +114,7 @@ def response_action(self, request, queryset):
                                                 'The execution was aborted.')
                         return HttpResponseRedirect(".")
                 else:
-                    messages.warning(request, 'Selecting all records, you will avoid the concurrency check')                               
-                                                   
+                    messages.warning(request, 'Selecting all records, you will avoid the concurrency check')
 
             response = func(self, request, queryset)
 
@@ -194,7 +193,7 @@ def save_model(self, request, obj, form, change):
             # If policy is set to 'silent' the user will be informed using message_user
             # raise Exception if not silent.
             # NOTE:
-            #   list_editable_policy MUST have the LIST_EDITABLE_POLICY_ABORT_ALL
+            # list_editable_policy MUST have the LIST_EDITABLE_POLICY_ABORT_ALL
             #   set to work properly
             if self.list_editable_policy == CONCURRENCY_LIST_EDITABLE_POLICY_ABORT_ALL:
                 raise