Merge branch 'release/1.1'

* release/1.1:
  bump 1.1
  restore tox.ini
  concurrency.api.disable_concurrency is now a noop if applied to a model not under concurrency management
  fixes admin action bug occurring when setting `select all` checkbox (`select_across`)
  code clean
  updates docs requirements
  updates .gitignore
  add rtd docs requirements
  update docs
  back to coveralls
  fixes travis config
  fixes travis config
  move requirements to dedicated file
  add missed demo application's  migration
  new field ConditionalVersionField
  updates README

Author: saxix

.gitignore

@@ -12,6 +12,7 @@ docs/build/
 /dist
 /build
 /MANIFEST
+/.eggs
 *.egg-info
 *.pyc
 *.log

.travis.yml

@@ -1,52 +1,49 @@
 language: python
 sudo: false
+python:
+  - 3.5
 
 cache:
   directories:
     - $HOME/.cache/pip
 
-branches:
-  only:
-    - develop
-    - master
-    - feature/travis
-
 services:
   - MySQL
   - PostgreSQL
 
 env:
-#  Travis give a TemplateDoesNotExist exception with django==1.6.x
-#  - TOXENV=py27-d16-pg
-#  - TOXENV=py27-d16-sqlite
-#  - TOXENV=py27-d16-mysql
-  - TOXENV=py27-d17-pg
-  - TOXENV=py27-d17-sqlite
-  - TOXENV=py27-d17-mysql
-  - TOXENV=py27-d18-pg
-  - TOXENV=py27-d18-sqlite
-  - TOXENV=py27-d18-mysql
-  - TOXENV=py27-d19-pg
-  - TOXENV=py27-d19-sqlite
-  - TOXENV=py27-d19-mysql
-  - TOXENV=py33-d17-pg
-  - TOXENV=py33-d17-sqlite
-  - TOXENV=py33-d18-pg
-  - TOXENV=py33-d18-sqlite
-  - TOXENV=py34-d17-pg
-  - TOXENV=py34-d17-sqlite
-  - TOXENV=py34-d18-pg
-  - TOXENV=py34-d18-sqlite
-  - TOXENV=py34-d19-pg
-  - TOXENV=py34-d19-sqlite
-#  - TOXENV=py35-d19-pg
-#  - TOXENV=py35-d19-sqlite
+   - TOXENV=py27-d18-pg
+   - TOXENV=py27-d18-sqlite
+   - TOXENV=py27-d18-mysql
+   - TOXENV=py27-d19-pg
+   - TOXENV=py27-d19-sqlite
+   - TOXENV=py27-d19-mysql
+
+   - TOXENV=py33-d18-pg
+   - TOXENV=py33-d18-sqlite
+
+   - TOXENV=py34-d18-pg
+   - TOXENV=py34-d18-sqlite
+   - TOXENV=py34-d19-pg
+   - TOXENV=py34-d19-sqlite
+
+   - TOXENV=py35-d18-pg
+   - TOXENV=py35-d18-sqlite
+   - TOXENV=py35-d19-pg
+   - TOXENV=py35-d19-sqlite
+
+   - TOXENV=pypy-d18-pg
+   - TOXENV=pypy-d18-sqlite
+   - TOXENV=pypy-d19-pg
+   - TOXENV=pypy-d19-sqlite
+
 
 install:
-  - pip install tox coverage python-coveralls>=2.5 coveralls>=0.5 codecov
+  - pip install tox "coverage<=4.0" python-coveralls>=2.5 coveralls>=0.5 codecov
 
 script:
-  - tox -e $TOXENV -- tests -vv --capture=no --cov=concurrency --cov-report=xml --cov-config=tests/.coveragerc
+  - tox -e $TOXENV -- py.test tests -v --capture=no --cov=concurrency \
+    --cov-report=xml --cov-config=tests/.coveragerc
 
 before_success:
   - coverage erase
@@ -55,3 +52,12 @@ after_success:
   - coverage combine
   - coveralls
   - codecov
+
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/bf3806c14c6efcff7da1
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always

CHANGES

@@ -1,7 +1,17 @@
+Release 1.1 (13 Feb 2016)
+-------------------------
+* drop support for django<1.7
+* add support for pypy
+* new :class:`concurrency.fields.ConditionalVersionField`
+* new decorator :class:`concurrency.api.concurrency_disable_increment`
+* :class:`concurrency.api.disable_concurrency` is now a noop if applied to a model not under concurrency management
+
+
 Release 1.0.1
 -------------
 * fixes :issue:`56` (thanks oppianmatt).
 
+
 Release 1.0
 -----------
 * **BACKWARD INCOMPATIBLE**:: dropped support for Django prior 1.6
@@ -18,6 +28,7 @@ Release 1.0
 * new :setting:`CONCURRECY_ENABLED` to fully disable concurrency
 * new :setting:`CONCURRECY_MANUAL_TRIGGERS` to disable triggers auto creation fixes :issue:`41` (thanks Naddiseo)
 
+
 Release 0.9
 -----------
 * Django 1.8 compatibility
@@ -92,6 +103,5 @@ Release 0.4.0
 
 Release 0.3.2
 ---------------------------------
-
 * fixed :issue:`3` (thanks pombredanne)
 * fixed :issue:`1` (thanks mbrochh)

MANIFEST.in

@@ -4,6 +4,15 @@ include CHANGES
 include LICENSE
 include MANIFEST.in
 include setup.py
+include tox.ini
+include *.py
+
+exclude Makefile
+exclude .editorconfig
+exclude .tx
+
+recursive-exclude .tx *
+
+recursive-include docs *
 recursive-include src *
-recursive-exclude src/django_concurrency.egg-info *
-recursive-exclude src *.py[oc]
+recursive-include tests *

Makefile

@@ -12,14 +12,14 @@ develop:
 	@pip install -U pip setuptools
 	@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>=1.4,<1.5'; fi"
-	@sh -c "if [ '${DJANGO}' = '1.5.x' ]; then pip install 'django>=1.5,<1.6'; fi"
-	@sh -c "if [ '${DJANGO}' = '1.6.x' ]; then pip install 'django>=1.6,<1.7'; fi"
-	@sh -c "if [ '${DJANGO}' = '1.7.x' ]; then pip install 'django>=1.7,<1.8'; fi"
-	@sh -c "if [ '${DJANGO}' = '1.8.x' ]; then pip install 'django>=1.8,<1.9'; fi"
-	@sh -c "if [ '${DJANGO}' = '1.9.x' ]; then pip install 'django>=1.9,<1.10'; fi"
-	@sh -c "if [ '${DJANGO}' = 'last' ]; then pip install django; fi"
-	@sh -c "if [ '${DJANGO}' = 'dev' ]; then pip install git+git://github.com/django/django.git; fi"
+#	@sh -c "if [ '${DJANGO}' = '1.4.x' ]; then pip install 'django>=1.4,<1.5'; fi"
+#	@sh -c "if [ '${DJANGO}' = '1.5.x' ]; then pip install 'django>=1.5,<1.6'; fi"
+#	@sh -c "if [ '${DJANGO}' = '1.6.x' ]; then pip install 'django>=1.6,<1.7'; fi"
+#	@sh -c "if [ '${DJANGO}' = '1.7.x' ]; then pip install 'django>=1.7,<1.8'; fi"
+#	@sh -c "if [ '${DJANGO}' = '1.8.x' ]; then pip install 'django>=1.8,<1.9'; fi"
+#	@sh -c "if [ '${DJANGO}' = '1.9.x' ]; then pip install 'django>=1.9,<1.10'; fi"
+#	@sh -c "if [ '${DJANGO}' = 'last' ]; then pip install django; fi"
+#	@sh -c "if [ '${DJANGO}' = 'dev' ]; then pip install git+git://github.com/django/django.git; fi"
 	@pip install -e .[dev]
 	$(MAKE) .init-db
 
@@ -34,9 +34,16 @@ develop:
 test:
 	py.test -v
 
+qa:
+	flake8 src/ tests/
+	isort -rc src/ --check-only
+	check-manifest
+
+
 clean:
 	rm -fr ${BUILDDIR} dist *.egg-info .coverage coverage.xml
 	find src -name __pycache__ -o -name "*.py?" -o -name "*.orig" -prune | xargs rm -rf
+	find tests -name __pycache__ -o -name "*.py?" -o -name "*.orig" -prune | xargs rm -rf
 	find src/concurrency/locale -name django.mo | xargs rm -f
 
 fullclean:

README.rst

@@ -5,7 +5,7 @@ Django Concurrency
 
 django-concurrency is an optimistic lock [1]_ implementation for Django.
 
-Supported Django versions: 1.7.x 1.8.x, 1.9rc1.
+Supported Django versions: 1.6.x, 1.7.x, 1.8.x, 1.9.
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.
@@ -46,6 +46,8 @@ Other projects that handle concurrent editing are `django-optimistic-lock`_ and
  * manage concurrency conflicts in admin's actions
  * can intercept changes performend out of the django app (ie using pgAdmin, phpMyAdmin, Toads) (using `TriggerVersionField`_)
  * can be disabled if needed (see `disable_concurrency`_)
+ * `ConditionalVersionField`_ to handle complex business rules
+
 
 Links
 ~~~~~
@@ -67,14 +69,15 @@ Links
 .. |master-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.png?branch=master
                     :target: http://travis-ci.org/saxix/django-concurrency/
 
-.. |master-cov| image:: https://codecov.io/github/saxix/django-concurrency/coverage.svg?branch=master
-                    :target: https://codecov.io/github/saxix/django-concurrency?branch=master
+.. |master-cov| image:: https://coveralls.io/repos/saxix/django-concurrency/badge.svg?branch=master&service=github
+            :target: https://coveralls.io/github/saxix/django-concurrency?branch=master
+
 
 .. |dev-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.png?branch=develop
                   :target: http://travis-ci.org/saxix/django-concurrency/
 
-.. |dev-cov| image:: https://codecov.io/github/saxix/django-concurrency/coverage.svg?branch=develop
-                :target: https://codecov.io/github/saxix/django-concurrency?branch=develop
+.. |dev-cov| image:: https://coveralls.io/repos/saxix/django-concurrency/badge.svg?branch=develop&service=github
+        :target: https://coveralls.io/github/saxix/django-concurrency?branch=develop
 
 
 .. |wheel| image:: https://pypip.in/wheel/blackhole/badge.png
@@ -89,6 +92,8 @@ _list-editable: https://django-concurrency.readthedocs.org/en/latest/admin.html#
 
 .. _TriggerVersionField: https://django-concurrency.readthedocs.org/en/latest/fields.html#triggerversionfield
 
+.. _ConditionalVersionField: https://django-concurrency.readthedocs.org/en/latest/fields.html#conditionalversionfield
+
 .. _disable_concurrency: https://django-concurrency.readthedocs.org/en/latest/api.html?#disable-concurrency
 
 .. [1] http://en.wikipedia.org/wiki/Optimistic_concurrency_control

docs/api.rst

@@ -183,6 +183,10 @@ concurrency on any Model.
 This features has been developed to be used in django commands
 
 
+.. versionchanged:: 1.1
+
+Does not raise an exception if a model not under concurrency management is passed as argument.
+
 examples
 ~~~~~~~~
 
@@ -205,6 +209,19 @@ examples
             deleted_version.revert()
 
 
+`concurrency_disable_increment()`
+---------------------------------
+
+.. versionadded:: 1.1
+
+
+Context manager to temporary disable version increment.
+Concurrent save is still checked but no version increment is triggered,
+this creates 'shadow saves',
+
+It accepts both a Model or an instance as target.
+
+
 
 ------------
 Templatetags

docs/fields.rst

@@ -84,3 +84,28 @@ example
     sax@: (concurrency) django-concurrency [feature/triggers*] $ ./demo/manage.py triggers create
     DATABASE             TRIGGERS
     default              concurrency_concurrency_triggerconcurrentmodel_u
+
+
+.. _concurrency.fields.ConditionalVersionField:
+
+
+ConditionalVersionField
+-----------------------
+
+.. versionadded:: 1.1
+
+
+This field allow to configure which fields trigger the version increment so to limit
+the scope of the concurrency checks.
+
+.. code-block:: python
+
+    class User(models.Model):
+        version = ConditionalVersionField()
+        username = models.CharField(...)
+        password = models.PasswordField(...)
+
+        class ConcurrencyMeta:
+            check_fields = ('username',)
+
+

docs/index.rst

@@ -12,8 +12,8 @@ Overview
     :target: http://travis-ci.org/saxix/django-concurrency/
     :alt: Test status
 
-.. image:: https://img.shields.io/coveralls/saxix/django-concurrency/master.svg
-    :target: https://coveralls.io/r/saxix/django-concurrency
+.. image:: https://codecov.io/github/saxix/django-concurrency/coverage.svg?branch=master
+    :target: https://codecov.io/github/saxix/django-concurrency?branch=master
     :alt: Coverage
 
 
@@ -79,4 +79,3 @@ Links
 
 
 .. [1] http://en.wikipedia.org/wiki/Optimistic_concurrency_control
-

docs/install.rst

@@ -39,6 +39,6 @@ How to run the tests
 
 .. code-block:: bash
 
-        $ pip tox
+        $ pip install tox
         $ tox