new field ConditionalVersionField

Author: saxix

.travis.yml

@@ -1,5 +1,7 @@
 language: python
 sudo: false
+python:
+  - 3.5
 
 cache:
   directories:
@@ -16,37 +18,34 @@ services:
   - 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
+   - py27-d18-pg
+   - py27-d18-sqlite
+   - py27-d18-mysql
+   - py27-d19-pg
+   - py27-d19-sqlite
+   - py27-d19-mysql
+   - py33-d18-pg
+   - py33-d18-sqlite
+   - py34-d18-pg
+   - py34-d18-sqlite
+   - py34-d19-pg
+   - py34-d19-sqlite
+   - py35-d18-pg
+   - py35-d18-sqlite
+   - py35-d19-pg
+   - py35-d19-sqlite
+   - pypy-d18-pg
+   - pypy-d18-sqlite
+   - pypy-d19-pg
+   - pypy-d19-sqlite
+
 
 install:
   - pip install tox coverage 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 -- tests -vv --capture=no --cov=concurrency \
+    --cov-report=xml --cov-config=tests/.coveragerc
 
 before_success:
   - coverage erase
@@ -55,3 +54,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,15 @@
+Release 1.1 (dev)
+-----------------
+* drop support for django<1.7
+* add support for pypy
+* new :class:`concurrency.fields.ConditionalVersionField`
+* new decorator :class:`concurrency.api.concurrency_disable_increment`
+
 Release 1.0.1
 -------------
 * fixes :issue:`56` (thanks oppianmatt).
 
+
 Release 1.0
 -----------
 * **BACKWARD INCOMPATIBLE**:: dropped support for Django prior 1.6
@@ -18,6 +26,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 +101,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:

docs/api.rst

@@ -205,6 +205,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,24 @@ example
     sax@: (concurrency) django-concurrency [feature/triggers*] $ ./demo/manage.py triggers create
     DATABASE             TRIGGERS
     default              concurrency_concurrency_triggerconcurrentmodel_u
+
+
+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
-

setup.cfg

@@ -18,21 +18,3 @@ max-complexity = 12
 max-line-length = 160
 exclude = .tox,migrations,.git,docs,diff_match_patch.py, deploy/**,settings
 ignore = E501,E401,W391,E128,E261,D
-
-[pytest]
-python_paths=./tests/demoapp/
-django_find_project = false
-DJANGO_SETTINGS_MODULE=demo.settings
-norecursedirs = .tox docs ./demoapp/
-python_files=tests/test_*.py
-addopts =
-        -q
-;        --reuse-db
-        --tb=short
-        --capture=no
-        --echo-version django
-        --echo-attr django.conf.settings.DATABASES.default.ENGINE
-
-pep8ignore = * ALL
-markers =
-    functional: mark a test as functional

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 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
@@ -9,11 +10,26 @@
 from setuptools.command.test import test as TestCommand
 
 ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__)))
-sys.path.insert(0, os.path.join(ROOT, 'src'))
+init = os.path.join(ROOT, 'src', 'concurrency', '__init__.py')
+app = imp.load_source('concurrency', init)
+
+reqs = 'install.py%d.pip' % sys.version_info[0]
+
+# if sys.version_info[0] == 2:
+#     reqs = 'install.py2.pip'
+    # app = imp.load_source('concurrency', init)
+# elif sys.version_info[0] == 3:
+#     reqs = 'install.py3.pip'
+    # if sys.version_info[1] in [3,4]:
+    #     from importlib.machinery import SourceFileLoader
+    #     app = SourceFileLoader("adminactions", init).load_module()
+    # elif sys.version_info[1] in [5]:
+    #     import importlib.util
+    #     spec = importlib.util.spec_from_file_location("concurrency", init)
+    #     app = importlib.util.module_from_spec(spec)
+    #     spec.loader.exec_module(app)
 
-app = __import__('concurrency')
 base_url = 'https://github.com/saxix/django-concurrency/'
-install_requires = []
 
 
 class PyTest(TestCommand):
@@ -58,9 +74,10 @@ def run(self):
             remove_tree(self.build_help, dry_run=self.dry_run)
         CleanCommand.run(self)
 
-install_requires = ["django"]
+install_requires = []
 test_requires = ["django-webtest>=1.7.5",
                  "mock>=1.0.1",
+                 "check-manifest==0.30",
                  "pytest-cache>=1.0",
                  "pytest-cov>=1.6",
                  "pytest-django>=2.8",
@@ -104,9 +121,8 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Framework :: Django :: 1.6',
-        'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',

src/concurrency/__init__.py

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