Merge pull request mx-moth#13 from timheap/django-3

Support Django 3.x, drop support for Django 1.x

.travis.yml

@@ -3,36 +3,34 @@ cache: pip
 
 matrix:
   include:
-    - env: TOXENV="py34-dj{110,111,20}"
+    - env: TOXENV="py34-dj20"
       python: '3.4'
-    - env: TOXENV="py35-dj{110,111,20,21}"
+
+    - env: TOXENV="py35-dj{20,21,22}"
       python: '3.5'
-    - env: TOXENV="py36-dj{110,111,20,21}"
-      python: '3.6'
-    - env: TOXENV="py37-dj{110,111,20,21}"
-      python: '3.7'
-      dist: xenial
-      sudo: true
+
     - env: |
-        TOXENV="py37-dj{111,20,21}-postgres"
+        TOXENV="py36-dj{20,21,22,30}-postgres"
         DATABASE_URL="postgres://postgres@localhost/database"
-      python: '3.7'
-      dist: xenial
-      sudo: true
+      python: '3.6'
       services:
         - postgresql
+
     - env: |
-        TOXENV="py37-dj{111,20,21}-mysql"
+        TOXENV="py36-dj{20,21,22,30}-mysql"
         DATABASE_URL="mysql://[email protected]/database"
-      python: '3.7'
-      dist: xenial
-      sudo: true
+      python: '3.6'
       services:
         - mysql
-    - env: TOXENV="flake8,isort,docs"
+
+    - env: TOXENV="py37-dj{20,21,22,30}"
       python: '3.7'
-      dist: xenial
-      sudo: true
+
+    - env: TOXENV="py38-dj{22,30}"
+      python: '3.8'
+
+    - env: TOXENV="flake8,isort,docs"
+      python: '3.8'
 
 install:
   - pip install --upgrade pip wheel tox

docs/requirements.txt

@@ -1,2 +1,2 @@
-Sphinx==1.3.1
+Sphinx==2.3.1
 sphinx_rtd_theme

enumchoicefield/fields.py

@@ -40,7 +40,7 @@ def __init__(self, enum_class, *args, **kwargs):
             len(item.name) for item in enum_class))
         super(EnumChoiceField, self).__init__(*args, **kwargs)
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection):
         """
         Convert a string from the database into an Enum value
         """

setup.py

@@ -21,7 +21,7 @@
     author_email='[email protected]',
     url='https://github.com/timheap/django-enumchoicefield',
 
-    install_requires=['Django>=1.10'],
+    install_requires=['Django>=2.0'],
     zip_safe=False,
     license='BSD License',
 
@@ -36,10 +36,10 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         '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',
         'Framework :: Django',
         'License :: OSI Approved :: BSD License',
     ],

tox.ini

@@ -1,9 +1,12 @@
 [tox]
+skip_missing_interpreters = True
+
 envlist =
-	py34-dj{110,111,20}
-	py35-dj{110,111,20,21,22}
-	py36-dj{111,20,21,22}
-	py37-dj{111,20,21,22}
+	py34-dj{20}
+	py35-dj{20,21,22}
+	py36-dj{20,21,22,30}
+	py37-dj{20,21,22,30}
+	py38-dj{22,30}
 	flake8,isort,docs
 
 [testenv]
@@ -15,11 +18,10 @@ passenv = DJANGO_SETTINGS_MODULE DATABASE_URL
 
 deps =
 	-rrequirements-test.txt
-	dj110: Django~=1.10.0
-	dj111: Django~=1.11.0
 	dj20: Django~=2.0.0
-	dj21: Django~=2.1a1
-	dj22: Django~=2.2a1
+	dj21: Django~=2.1.0
+	dj22: Django~=2.2.0
+	dj30: Django~=3.0.0
 	postgres: psycopg2
 	mysql: mysqlclient