Upgrading dependencies (#237)

* upgrade dependencies; mark compat code as no cover; new test matrix on readme
* requirements: Upgrade Sphinx due to vulnerability issue
* chore: Drop support for Python3.4

Author: fgmacedo

.gitignore

@@ -65,3 +65,4 @@ target/
 # Editors
 *.sublime-*
 .idea/
+.vscode/

HISTORY.rst

@@ -2,6 +2,13 @@
 History
 -------
 
+0.7.0 (not released)
+--------------------
+
+* Add support Django 3.0 (tks @klette).
+* Drop support for Python 3.4.
+
+
 0.6.0 (2019-09-05)
 ------------------
 

README.rst

@@ -37,8 +37,8 @@ Features
 * An ``ChoicesEnum`` that can be used to create constant groups.
 * ``ChoicesEnum`` can define labels to be used in `choices` fields.
 * Django fields included:  ``EnumCharField`` and ``EnumIntegerField``.
-* Support (tested) for Python 2.7, 3.4, 3.5, 3.6 and 3.7.
-* Support (tested) for Django 1.9, 1.10, 1.11, 2.0 and 2.1.
+* Support (tested) for Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+* Support (tested) for Django 1.9, 1.10, 1.11, 2.0, 2.1, 2.2 and 3.0.
 
 --------------
 Usage examples

choicesenum/django/compat.py

@@ -15,13 +15,11 @@ def __init__(self, field, model):
         self.field = field
         if django.VERSION < (2, 1):  # pragma: no cover (Django < 2.1 compat)
             super(Creator, self).__init__(field.attname, model)
-        elif django.VERSION < (3, 0):
+        elif django.VERSION < (3, 0):  # pragma: no cover (Django < 3.0 compat)
             super(Creator, self).__init__(field.attname)
         else:  # pragma: no cover
             super(Creator, self).__init__(field)
 
     def __set__(self, obj, value):
-        if hasattr(self, 'field_name'):
-            obj.__dict__[self.field_name] = self.field.to_python(value)
-        else:
-            obj.__dict__[self.field.attname] = self.field.to_python(value)
+        field_name = getattr(self, 'field_name', self.field.attname)
+        obj.__dict__[field_name] = self.field.to_python(value)

docs/index.rst

@@ -1,5 +1,5 @@
 Welcome to Choices Enum's documentation!
-======================================
+========================================
 
 Contents:
 
@@ -8,8 +8,6 @@ Contents:
 
    readme
    installation
-   usage
-   modules
    contributing
    authors
    history

docs/usage.rst

@@ -1,14 +1,14 @@
 # test
 -r requirements_test.txt
-Django==2.2.8
+Django==2.2.13
 tox==3.14.0
 
 # docs
-Sphinx==2.2.0
+Sphinx==3.0.4
 
 # build / deploy
-PyYAML==5.1.2
-wheel==0.33.6
-bumpversion==0.5.3
-cryptography==2.7
-pip==19.2.3
+PyYAML==5.3.1
+wheel==0.34.2
+bumpversion==0.6.0
+cryptography==3.0
+pip==20.2

requirements_dev.txt

@@ -1,10 +1,10 @@
 # test
 mock==3.0.5
-pytest==4.6.5
+pytest==4.6.9
 pytest-cov==2.7.1
 pytest-django==3.4.8
 pytest-watch==4.2.0
-pytest-sugar==0.9.2
+pytest-sugar==0.9.4
 schematics==2.1.0
 
 

requirements_test.txt

@@ -33,17 +33,17 @@
     zip_safe=False,
     keywords='choicesenum',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 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',
     ],
     setup_requires=setup_requirements,
 )

setup.py

@@ -1,10 +1,10 @@
 [tox]
 envlist =
     py{27}-django-{19,110,111}
-    py{34}-django-{110,111,20}
-    py{35,36,37,38}-django-{110,111,20,21,22}
+    py{35,36,37}-django-{111,20,21}
+    py{35,36,37,38}-django-{22}
     py{36,37,38}-django-{30}
-    py36-flake8
+    py38-flake8
 
 [pytest]
 filterwarnings =
@@ -16,7 +16,6 @@ python =
     3.7: py37
     3.6: py36
     3.5: py35
-    3.4: py34
     2.7: py27
 
 [testenv]
@@ -41,10 +40,9 @@ basepython =
     py37: python3.7
     py36: python3.6
     py35: python3.5
-    py34: python3.4
     py27: python2.7
 
 
-[testenv:py36-flake8]
+[testenv:py38-flake8]
 commands = flake8 choicesenum/ tests/
 deps = flake8