Merge branch 'release/2.0'

* release/2.0: (34 commits)
  updates tox/travis config
  updates tox/travis config
  update version / CHANGES
  updates Makefile
  Update cookbook section with django-reversion
  Removes unused links from README
  updaets travis
  list and pre-commit support
  restores support django>=1.10
  update CHANGES and bump version
  trying to fix travis config
  trying to fix travis config
  update travis config
  fixes type in 'triggers' management commant
  update travis config
  fixes support for django 2.1
  updates travis config to use postgres 9.4
  code clean
  official support only for python3 and Django>2.0
  add start()/finish() to disable_concurrency()
  ...

Author: saxix

.gitignore

@@ -23,3 +23,4 @@ __pycache__
 *.egg-info
 *.sqlite
 .testmondata
+Pipfile.lock

.pre-commit-config.yaml

@@ -0,0 +1,43 @@
+exclude: '^$'
+fail_fast: false
+repos:
+-   repo: local
+    hooks:
+      - id: isort
+        args:
+            - -rc
+            - src/
+            - tests/
+        name: isort
+        entry: isort
+        language: system
+        types: [python]
+      - id: check-manifest
+        name: check-manifest
+        entry: check-manifest
+        language: system
+        types: [python]
+        files: '^$'
+        always_run: true
+
+-   repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v1.4.0
+    hooks:
+    -   id: debug-statements
+        exclude: manage.py
+    -   id: end-of-file-fixer
+    -   id: flake8
+        exclude: docs/
+        args:
+        - src/
+        - tests/
+    -   id: check-merge-conflict
+    -   id: check-case-conflict
+#    -   id: name-tests-test
+#    -   id: trailing-whitespace
+#    -   id: requirements-txt-fixer
+#        files: requirements-dev.txt
+#-   repo: git://github.com/asottile/reorder_python_imports
+#    rev: v1.0.1
+#    hooks:
+#    -   id: reorder-python-imports

.travis.yml

@@ -1,11 +1,11 @@
 language: python
-sudo: false
+sudo: true
 python:
-  - 2.7
-  - 3.4
   - 3.5
   - 3.6
 
+addons:
+  postgresql: "9.4"
 
 cache:
   directories:
@@ -15,35 +15,55 @@ services:
   - MySQL
   - PostgreSQL
 
+jobs:
+  include:
+    - python: 3.7
+      env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.0 DB=mysql
+      sudo: required
+      dist: xenial
+
+    - python: 3.7
+      env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.1 DB=pg
+      sudo: required
+      dist: xenial
+
+    - python: 3.7
+      env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.0 DB=mysql
+      sudo: required
+      dist: xenial
+
+    - python: 3.7
+      env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.1 DB=pg
+      sudo: required
+      dist: xenial
+
+
 env:
-  - DJANGO=1.8 DB=pg
-  - DJANGO=1.9 DB=pg
-  - DJANGO=1.10 DB=pg
   - DJANGO=1.11 DB=pg
+  - DJANGO=2.0 DB=pg
+  - DJANGO=2.1 DB=pg
 
-  - DJANGO=1.8 DB=mysql
-  - DJANGO=1.9 DB=mysql
-  - DJANGO=1.10 DB=mysql
   - DJANGO=1.11 DB=mysql
+  - DJANGO=2.0 DB=mysql
+  - DJANGO=2.1 DB=mysql
 
 
 matrix:
   exclude:
     - python: 2.7
-      env: DJANGO=2.0
+      env: DJANGO=2.0 DB=pg
 
-    - python: 3.4
-      env: DJANGO=2.0
+    - python: 2.7
+      env: DJANGO=2.0 DB=mysql
+
+    - python: 2.7
+      env: DJANGO=2.1 DB=pg
 
-    - python: 3.6
-      env: DJANGO=1.8
-    - python: 3.6
-      env: DJANGO=1.9
-    - python: 3.6
-      env: DJANGO=1.10
+    - python: 2.7
+      env: DJANGO=2.1 DB=mysql
 
 install:
-  - pip install tox "coverage<=4.0" python-coveralls>=2.5 coveralls>=0.5 codecov
+  - pip install tox "coverage<=4.0" codecov
 
 script:
   - tox -e "py${TRAVIS_PYTHON_VERSION//.}-d${DJANGO//.}-${DB}" -- py.test tests -v

.tx/config

@@ -6,4 +6,3 @@ source_lang = en
 [main]
 host = https://www.transifex.com
 type = PO
-

AUTHORS

@@ -1 +1 @@
-Stefano Apostolico <[email protected]>
+Stefano Apostolico <[email protected]>

CHANGES

@@ -1,5 +1,14 @@
-Release 1.4
+Release 2.0
 -----------
+* drop official support to Django < 1.10
+* add support Django 2.1
+* removed deprecated api `concurrency_check`
+* BACKWARD INCOMPATIBLE: version field is now mandatory in any save operation. Use ``VERSION_FIELD_REQUIRED=False`` to have the old behaviour.
+* `disable_concurrency` now has `start()`, `finish()` to be called as command
+
+
+Release 1.4 (13 Sep 2016)
+-------------------------
 * closes :issue:`81`. Add docs and check.
 * fixes :issue:`80`. (thanks Naddiseo for the useful support)
 * Django 1.11 compatibility
@@ -58,7 +67,7 @@ Release 1.0
 * **BACKWARD INCOMPATIBLE**:: removed custom backends. ``TriggerVerionField`` can be used with standard Django
 * new way to create triggers (thanks Naddiseo)
 * new trigger code
-* new :method:`TriggerVersionField.check`.
+* new :attr:`TriggerVersionField.check`.
 * new :attr:`TriggerVersionField.trigger_name`.
 * new :setting:`CONCURRECY_ENABLED` to fully disable concurrency
 * new :setting:`CONCURRECY_MANUAL_TRIGGERS` to disable triggers auto creation fixes :issue:`41` (thanks Naddiseo)
@@ -68,7 +77,7 @@ Release 0.9
 -----------
 * Django 1.8 compatibility
 * python 3.4 compatibility
-* **BACKWARD INCOMPATIBLE** :function:`disable_concurrency` works differently if used with classes or instances
+* **BACKWARD INCOMPATIBLE** :func:`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 TriggerVersionField and Proxy Models (thanx Richard Eames)
 

MANIFEST.in

@@ -8,9 +8,11 @@ include tox.ini
 include *.py
 
 exclude Makefile
+exclude Pipfile
 exclude .editorconfig
 exclude .tx
 exclude .pyc
+exclude .pre-commit-config.yaml
 
 recursive-exclude .tx *
 recursive-exclude __pycache__ *

Makefile

@@ -9,27 +9,30 @@ DJANGO?='last'
 	mkdir -p ${BUILDDIR}
 
 develop:
-	@pip install -U pip setuptools
+	@pip install pipenv
 	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then pip install  MySQL-python; fi"
 	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then pip install -q psycopg2; fi"
-	@pip install -e .[dev]
 	$(MAKE) .init-db
+	@pipenv install -d --skip-lock
 
 
 .init-db:
-	@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}' = 'mysql' ]; then mysql -h 127.0.0.1 -u root -e 'DROP DATABASE IF EXISTS concurrency;'; fi"
+	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -h 127.0.0.1 -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 psql -h localhost -c 'DROP DATABASE IF EXISTS concurrency;' -U postgres; fi"
+	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -h localhost -c 'CREATE DATABASE concurrency;' -U postgres; fi"
 
 test:
 	py.test -v --create-db
 
-qa:
-	flake8 src/ tests/
-	isort -rc src/ --check-only
-	check-manifest
+lint:
+	pre-commit run --all-files
+	pipenv run isort -rc src/ --check-only
+	pipenv run check-manifest
+
+travis:
+	docker run --privileged --name travis-debug -it -u travis travisci/ci-amethyst:packer-1512508255-986baf0 /bin/bash -l
 
 
 clean:
@@ -45,7 +48,7 @@ fullclean:
 
 docs: .mkbuilddir
 	mkdir -p ${BUILDDIR}/docs
-	sphinx-build -aE docs/ ${BUILDDIR}/docs
+	pipenv run sphinx-build -aE docs/ ${BUILDDIR}/docs
 ifdef BROWSE
 	firefox ${BUILDDIR}/docs/index.html
 endif

Pipfile

@@ -0,0 +1,25 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+django = "==2.1"
+pre-commit = "*"
+
+[dev-packages]
+django-reversion = "*"
+django-webtest = "*"
+mock = "*"
+pytest = "*"
+pytest-cov = "*"
+pytest-django = "*"
+pytest-echo = "*"
+pytest-pythonpath = "*"
+tox = "*"
+"psycopg2-binary" = "*"
+check-manifest = "*"
+sphinx = "*"
+
+[requires]
+python_version = "3.6"

README.rst

@@ -3,9 +3,14 @@ Django Concurrency
 ==================
 
 
+.. image:: https://badge.fury.io/py/django-concurrency.svg
+   :target: http://badge.fury.io/py/django-concurrency
+   :alt: PyPI package
+
+
 django-concurrency is an optimistic lock [1]_ implementation for Django.
 
-Supported Django versions: 1.8.x, 1.9.x, 1.10.x., 1.11.x
+Supported Django versions: 1.8.x, 1.9.x, 1.10.x., 1.11.x, 2.x
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.
@@ -66,25 +71,30 @@ Links
 | Documentation:     |https://django-concurrency.readthedocs.org/en/latest/   |
 +--------------------+---------------+--------------+-------------------------+
 
-.. |master-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.png?branch=master
+.. |master-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.svg?branch=master
                     :target: http://travis-ci.org/saxix/django-concurrency/
 
 .. |master-cov| image:: https://codecov.io/gh/saxix/django-concurrency/branch/master/graph/badge.svg
                     :target: https://codecov.io/gh/saxix/django-concurrency
 
-.. |dev-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.png?branch=develop
+.. |master-doc| image:: https://readthedocs.org/projects/django-concurrency/badge/?version=stable
+                    :target: http://django-concurrency.readthedocs.io/en/stable/
+
+.. |dev-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.svg?branch=develop
                   :target: http://travis-ci.org/saxix/django-concurrency/
 
 .. |dev-cov| image:: https://codecov.io/gh/saxix/django-concurrency/branch/develop/graph/badge.svg
                     :target: https://codecov.io/gh/saxix/django-concurrency
 
+.. |dev-doc| image:: https://readthedocs.org/projects/django-concurrency/badge/?version=stable
+                    :target: http://django-concurrency.readthedocs.io/en/stable/
 
 
-.. |wheel| image:: https://pypip.in/wheel/blackhole/badge.png
+
+.. |wheel| image:: https://img.shields.io/pypi/wheel/django-concurrency.svg
 
 _list-editable: https://django-concurrency.readthedocs.org/en/latest/admin.html#list-editable
 
-.. _list-editable: https://django-concurrency.readthedocs.org/en/latest/admin.html#list-editable
 
 .. _django-locking: https://github.com/stdbrouw/django-locking
 
@@ -96,8 +106,6 @@ _list-editable: https://django-concurrency.readthedocs.org/en/latest/admin.html#
 
 .. _disable_concurrency: https://django-concurrency.readthedocs.org/en/latest/api.html?#disable-concurrency
 
-.. [1] http://en.wikipedia.org/wiki/Optimistic_concurrency_control
-
 
 
 .. image:: https://badges.gitter.im/Join%20Chat.svg