Merge branch 'release/2.0' into develop

* release/2.0:
  updates tox/travis config
  updates tox/travis config
  update version / CHANGES

Author: saxix

.travis.yml

@@ -39,13 +39,11 @@ jobs:
 
 
 env:
-  - DJANGO=1.10 DB=pg
   - DJANGO=1.11 DB=pg
   - DJANGO=2.0 DB=pg
   - DJANGO=2.1 DB=pg
 
-  - DJANGO=1.10 DB=mysql
-  - DJANGO=1.10 DB=mysql
+  - DJANGO=1.11 DB=mysql
   - DJANGO=2.0 DB=mysql
   - DJANGO=2.1 DB=mysql
 
@@ -58,6 +56,12 @@ matrix:
     - python: 2.7
       env: DJANGO=2.0 DB=mysql
 
+    - python: 2.7
+      env: DJANGO=2.1 DB=pg
+
+    - python: 2.7
+      env: DJANGO=2.1 DB=mysql
+
 install:
   - pip install tox "coverage<=4.0" codecov
 

CHANGES

@@ -1,11 +1,12 @@
-Release 2.0 (dev)
------------------
+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.

src/concurrency/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'sax'
 default_app_config = 'concurrency.apps.ConcurrencyConfig'
 
-VERSION = __version__ = "2.0a0"
+VERSION = __version__ = "2.0"
 NAME = 'django-concurrency'

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-envlist = d{110,111}-py{27,35,36,py}-{pg,sqlite,mysql},
-          d{20,21}-py{35,36}-{pg,sqlite,mysql}
+envlist = d{111}-py{27,35,36,37,py}-{pg,sqlite,mysql},
+          d{20,21}-py{35,36,37}-{pg,sqlite,mysql}
 
 
 [pytest]