Merge branch 'release/2.2'

* release/2.2:
  bumpversion 2.2
  updates travis
  drop support django<3
  start version 2.2a

Author: saxix

.gitignore

@@ -25,3 +25,4 @@ __pycache__
 .testmondata
 Pipfile.lock
 poetry.lock
+pyproject.toml

.travis.yml

@@ -18,14 +18,7 @@ services:
 
 
 env:
-  - DJANGO=1.11 DB=pg
-  - DJANGO=2.1 DB=pg
-  - DJANGO=2.2 DB=pg
   - DJANGO=3.0 DB=pg
-
-  - DJANGO=1.11 DB=mysql
-  - DJANGO=2.1 DB=mysql
-  - DJANGO=2.2 DB=mysql
   - DJANGO=3.0 DB=mysql
 
 

CHANGES

@@ -1,3 +1,9 @@
+Release 2.2
+-------------
+* drop suppot django<3.0
+* drop suppot Python<3.6
+
+
 Release 2.1.1
 -------------
 * fixes packaging

README.rst

@@ -10,7 +10,11 @@ Django Concurrency
 
 django-concurrency is an optimistic lock [1]_ implementation for Django.
 
-Supported Django versions: 1.11.x, 2.1.x, 2.2.x, 3.x
+Supported Django versions:
+
+    - <=2.1.1  supports    1.11.x, 2.1.x, 2.2.x, 3.x
+    - >=2.2    supports    3.x
+
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.

src/concurrency/__init__.py

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

tox.ini

@@ -1,6 +1,5 @@
 [tox]
-envlist = d{111,21}-py{35,36,37}-{pg,sqlite,mysql}
-          d{22,30}-py{36,37,38}-{pg,sqlite,mysql}
+envlist = d{30}-py{36,37,38}-{pg,sqlite,mysql}
 
 
 [pytest]
@@ -43,22 +42,23 @@ setenv =
 
 
 deps =
-    django-reversion>=3.0.5
+    django-reversion
     django-webtest
     mock
     pytest
     pytest-cov
     pytest-django
     pytest-echo
     pytest-pythonpath
-    py{27,34,35,36,37,38}-pg: psycopg2-binary
+;    py{27,34,35,36,37,38}-pg:
+    psycopg2-binary
     pypy-pg: psycopg2cffi
     mysql: mysqlclient
     docs: -rdocs/requirements.pip
-    d111: django>=1.11,<1.12
-    d20: django>=2.0,<2.1
-    d21: django>=2.1,<2.2
-    d22: django>=2.2,<2.3
+;    d111: django>=1.11,<1.12
+;    d20: django>=2.0,<2.1
+;    d21: django>=2.1,<2.2
+;    d22: django>=2.2,<2.3
     d30: django>=3.0,<3.1