Merge branch 'release/2.1'

saxix · saxix · commit 895b9e398c68 · 2020-01-24T19:04:53.000+01:00
* release/2.1:
  bump version and updates CHANGES
  code clean
  updates gitignore
  drop support python&lt;3.5
  fixes admin integration
  restore mysql in tox.ini
  fixes test suite
  updates CI config
  code clean
  updaets README
  updates setup.py.CHANGES/travis to test py3.7
  updates travis config
  revert travis config to enable python 3.7
  add django 2.2rc1 to tox
  removes six
  start 2.1
  update Pipfile
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ __pycache__
 *.sqlite
 .testmondata
 Pipfile.lock
+poetry.lock
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: python
 sudo: true
 python:
-  - 3.5
   - 3.6
+  - 3.7
+  - 3.8
 
 addons:
   postgresql: "9.4"
@@ -15,58 +16,24 @@ 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.11 DB=pg
-  - DJANGO=2.0 DB=pg
   - DJANGO=2.1 DB=pg
+  - DJANGO=2.2 DB=pg
+  - DJANGO=3.0 DB=pg
 
   - DJANGO=1.11 DB=mysql
-  - DJANGO=2.0 DB=mysql
   - DJANGO=2.1 DB=mysql
+  - DJANGO=2.2 DB=mysql
+  - DJANGO=3.0 DB=mysql
 
 
-matrix:
-  exclude:
-    - python: 2.7
-      env: DJANGO=2.0 DB=pg
-
-    - 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
 
 script:
-  - tox -e "py${TRAVIS_PYTHON_VERSION//.}-d${DJANGO//.}-${DB}" -- py.test tests -v
+  - tox -e "py${TRAVIS_PYTHON_VERSION//.}-d${DJANGO//.}-${DB}" -- pytest tests -v
 
 before_success:
   - coverage erase
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+Release 2.1
+-----------
+* drop support Python < 3.5
+* add support Django 2.2 / 3.0
+* drop support Django < 1.11
+
+
 Release 2.0
 -----------
 * drop official support to Django < 1.10
diff --git a/Pipfile b/Pipfile
@@ -4,10 +4,10 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "==2.1"
-pre-commit = "*"
 
 [dev-packages]
+django = "*"
+pre-commit = "*"
 django-reversion = "*"
 django-webtest = "*"
 mock = "*"
@@ -20,6 +20,7 @@ tox = "*"
 "psycopg2-binary" = "*"
 check-manifest = "*"
 sphinx = "*"
+twine="*"
 
 [requires]
 python_version = "3.6"
diff --git a/README.rst b/README.rst
@@ -10,7 +10,7 @@ Django Concurrency
 
 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, 2.x
+Supported Django versions: 1.11.x, 2.1.x, 2.2.x, 3.x
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.
diff --git a/docs/conf.py b/docs/conf.py
@@ -71,7 +71,7 @@
 
 # General information about the project.
 project = u'Django Concurrency'
-copyright = u'2012-2015, Stefano Apostolico'
+copyright = u'2012-2019, Stefano Apostolico'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/setup.py b/setup.py
@@ -48,7 +48,7 @@ def run_tests(self):
     description='Optimistic lock implementation for Django. Prevents users from doing concurrent editing.',
     long_description=open('README.rst').read(),
     license='MIT License',
-    keywords='django',
+    keywords='django, concurrency, optimistic lock, locking, concurrent editing',
     setup_requires=['pytest-runner', ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -57,16 +57,14 @@ def run_tests(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
-        'Programming Language :: Python :: 2.7',
+        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
diff --git a/src/concurrency/__init__.py b/src/concurrency/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'sax'
 default_app_config = 'concurrency.apps.ConcurrencyConfig'
 
-VERSION = __version__ = "2.0"
+VERSION = __version__ = "2.1"
 NAME = 'django-concurrency'
diff --git a/src/concurrency/admin.py b/src/concurrency/admin.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import operator
 import re
 from functools import reduce
@@ -207,12 +204,12 @@ def save_model(self, request, obj, form, change):
     def log_change(self, request, object, message):
         if object.pk in self._get_conflicts(request):
             return
-        super(ConcurrencyListEditableMixin, self).log_change(request, object, message)
+        return super(ConcurrencyListEditableMixin, self).log_change(request, object, message)
 
     def log_deletion(self, request, object, object_repr):
         if object.pk in self._get_conflicts(request):
             return
-        super(ConcurrencyListEditableMixin, self).log_deletion(request, object, object_repr)
+        return super(ConcurrencyListEditableMixin, self).log_deletion(request, object, object_repr)
 
     def message_user(self, request, message, *args, **kwargs):
         # This is ugly but we do not want to touch the changelist_view() code.
diff --git a/src/concurrency/api.py b/src/concurrency/api.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 
 from django.db.models import Model
diff --git a/src/concurrency/apps.py b/src/concurrency/apps.py
@@ -1,11 +1,6 @@
-from __future__ import absolute_import, unicode_literals
+from django.apps import AppConfig
 
-try:
-    from django.apps import AppConfig
 
-    class ConcurrencyConfig(AppConfig):
-        name = 'concurrency'
-        verbose = 'Django Concurrency'
-
-except ImportError:  # pragma: no cover
-    pass
+class ConcurrencyConfig(AppConfig):
+    name = 'concurrency'
+    verbose = 'Django Concurrency'
diff --git a/src/concurrency/compat.py b/src/concurrency/compat.py
@@ -1,12 +1,2 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
-# import django
-# if django.VERSION <(1,9):
-#     from django.template.base import TemplateDoesNotExist
-# else:
 from django.template.exceptions import TemplateDoesNotExist  # noqa
-# if django.VERSION <(1,9):
-#     from django.core.urlresolvers import get_callable  # noqa
-# else:
 from django.urls.utils import get_callable  # noqa
diff --git a/src/concurrency/config.py b/src/concurrency/config.py
@@ -1,9 +1,5 @@
-# coding=utf-8
-from __future__ import absolute_import, unicode_literals
-
 from django.core.exceptions import ImproperlyConfigured
 from django.test.signals import setting_changed
-from django.utils import six
 
 from .compat import get_callable
 
@@ -53,7 +49,7 @@ def _set_attr(self, prefix_name, value):
             raise ImproperlyConfigured('IGNORE_DEFAULT has been removed in django-concurrency 1.5. '
                                        'Use VERSION_FIELD_REQUIRED instead')
         elif name == 'CALLBACK':
-            if isinstance(value, six.string_types):
+            if isinstance(value, str):
                 func = get_callable(value)
             elif callable(value):
                 func = value
diff --git a/src/concurrency/core.py b/src/concurrency/core.py
@@ -1,6 +1,3 @@
-# coding=utf-8
-from __future__ import absolute_import, unicode_literals
-
 import logging
 
 from concurrency.config import conf
diff --git a/src/concurrency/exceptions.py b/src/concurrency/exceptions.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.core.exceptions import SuspiciousOperation, ValidationError
 from django.db import DatabaseError
 from django.utils.translation import ugettext as _
diff --git a/src/concurrency/fields.py b/src/concurrency/fields.py
@@ -1,6 +1,3 @@
-# coding=utf-8
-from __future__ import absolute_import, unicode_literals
-
 import copy
 import functools
 import hashlib
diff --git a/src/concurrency/forms.py b/src/concurrency/forms.py
@@ -1,7 +1,3 @@
-# coding=utf-8
-from __future__ import absolute_import, unicode_literals
-
-import six
 from importlib import import_module
 
 from django import forms
@@ -120,7 +116,7 @@ def prepare_value(self, value):
     def to_python(self, value):
         try:
             if value not in (None, '', 'None'):
-                return int(self._signer.unsign(six.text_type(value)))
+                return int(self._signer.unsign(str(value)))
             return 0
         except (BadSignature, ValueError):
             raise VersionError(value)
diff --git a/src/concurrency/management/commands/triggers.py b/src/concurrency/management/commands/triggers.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from functools import partial
 
 import django
diff --git a/src/concurrency/middleware.py b/src/concurrency/middleware.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from django.core.signals import got_request_exception
 
 from concurrency.config import conf
diff --git a/src/concurrency/templatetags/concurrency.py b/src/concurrency/templatetags/concurrency.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.template import Library
 from django.templatetags.l10n import unlocalize
 from django.utils.safestring import mark_safe
diff --git a/src/concurrency/triggers.py b/src/concurrency/triggers.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from collections import defaultdict
 
 from django.apps import apps
diff --git a/src/concurrency/utils.py b/src/concurrency/utils.py
@@ -1,9 +1,5 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import inspect
 import logging
-import six
 import warnings
 
 from concurrency.exceptions import RecordModifiedError
@@ -208,7 +204,7 @@ def flatten(iterable):
 
     result = list()
     for el in iterable:
-        if hasattr(el, "__iter__") and not isinstance(el, six.string_types):
+        if hasattr(el, "__iter__") and not isinstance(el, str):
             result.extend(flatten(el))
         else:
             result.append(el)
diff --git a/src/concurrency/views.py b/src/concurrency/views.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from django.http import HttpResponse
 from django.template import loader
 from django.template.base import Template
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -26,11 +26,6 @@ def pytest_configure():
 
     settings.SILENCED_SYSTEM_CHECKS = ['concurrency.W001']
     settings.CONCURRENCY_VERSION_FIELD_REQUIRED = False
-    if django.VERSION[:2] == (1.6):
-        from concurrency.api import apply_concurrency_check
-        from concurrency.fields import IntegerVersionField
-
-        apply_concurrency_check(Group, 'version', IntegerVersionField)
 
 
 @pytest.fixture(scope='session')
diff --git a/tests/demoapp/demo/settings.py b/tests/demoapp/demo/settings.py
diff --git a/tests/test_command.py b/tests/test_command.py
diff --git a/tests/test_issues.py b/tests/test_issues.py
diff --git a/tox.ini b/tox.ini
