Merge 82dc968 into 1d71af0

.travis.yml

@@ -1,26 +1,51 @@
 sudo: false
 
 language: python
-python: 3.6
+python: 3.5
 
 env:
   matrix:
     - ENV=py27-django18
     - ENV=py27-django19
     - ENV=py27-django110
     - ENV=py27-django111
-    - ENV=py33-django18
+
     - ENV=py34-django18
     - ENV=py34-django19
     - ENV=py34-django110
     - ENV=py34-django111
+    - ENV=py34-django20
+
     - ENV=py35-django18
     - ENV=py35-django19
     - ENV=py35-django110
     - ENV=py35-django111
-    - ENV=py36-django111
+    - ENV=py35-django20
+    - ENV=py35-django21
+
     - ENV=coverage
 
+matrix:
+  include:
+    - env: ENV=py33-django18
+      python: 3.4
+
+    - env: ENV=py36-django111
+      python: 3.6
+    - env: ENV=py36-django20
+      python: 3.6
+    - env: ENV=py36-django21
+      python: 3.6
+
+    - env: ENV=py37-django20
+      python: 3.7
+      sudo: true
+      dist: xenial
+    - env: ENV=py37-django21
+      python: 3.7
+      sudo: true
+      dist: xenial
+
 install:
   - pip install tox
 

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+
+- Added Django 2.1 support
+- Added Python 3.7 support
+
 ## [1.4.0]
 
 - Added Django 1.11 support (from [#43](https://github.com/5monkeys/django-enumfield/pull/43))

README.rst

@@ -22,7 +22,7 @@ Provides an enumeration Django model field (using IntegerField) with reusable en
 Installation
 ------------
 
-Currently, `we test`__ Django versions 1.8-1.11 and Python versions 2.7,3.3-3.6.
+Currently, `we test`__ Django versions 1.8-2.1 and Python versions 2.7,3.3-3.7.
 
 Install ``django-enumfield`` in your Python environment:
 

django_enumfield/tests/__init__.py

@@ -1,2 +0,0 @@
-import warnings
-warnings.filterwarnings('error', category=DeprecationWarning)

run_tests.py

@@ -16,7 +16,12 @@ def delete_migrations():
 
 def main():
     import warnings
-    warnings.filterwarnings('error', category=DeprecationWarning)
+    # Ignore deprecation warning caused by Django on 3.7 + 2.0
+    is_py37_django20 = (
+        sys.version_info[:2] == (3, 7) and django.VERSION[:2] == (2, 0)
+    )
+    module = r"(?!django).*" if is_py37_django20 else ""
+    warnings.filterwarnings('error', module=module, category=DeprecationWarning)
 
     delete_migrations()
 

tox.ini

@@ -1,17 +1,21 @@
 [tox]
 envlist =
-    py{27,34,35}-django{18,19,110,111}
+    py27-django{18,19,110,111}
     py33-django18
-    py36-django111
+    py34-django{18,19,110,111,20}
+    py35-django{18,19,110,111,20,21}
+    py36-django{111,20,21}
+    py37-django{20,21}
     coverage
-skip_missing_interpreters = true
 
 [testenv]
 deps=
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
 commands = make test
 
 [testenv:coverage]