Support django 3 (#103)

* Update reqs for travis * Exclude versions * Update from master
goinnn · Dec 19, 2019 · 9e34852 · 9e34852
1 parent 1b4353b
commit 9e34852
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
 env:
   - DJANGO_VERSION='Django>=1.4,<1.5'
   - DJANGO_VERSION='Django>=1.5,<1.6'
@@ -17,13 +18,19 @@ env:
   - DJANGO_VERSION='Django>=1.11,<2.0'
   - DJANGO_VERSION='Django>=2.0,<2.1'
   - DJANGO_VERSION='Django>=2.1,<2.2'
+  - DJANGO_VERSION='Django>=2.2,<3.0'
+  - DJANGO_VERSION='Django>=3.0'
   - DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
 matrix:
   exclude:
     - python: "2.7"
       env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
     - python: "2.7"
       env: DJANGO_VERSION='Django>=2.1,<2.2'
+    - python: "2.7"
+      env: DJANGO_VERSION='Django>=2.2,<3.0'
+    - python: "2.7"
+      env: DJANGO_VERSION='Django>=3.0'
     - python: "2.7"
       env: DJANGO_VERSION='Django>=2.0,<2.1'
     - python: "2.7"
@@ -36,6 +43,10 @@ matrix:
       env: DJANGO_VERSION='Django>=1.6,<1.7'
     - python: "3.4"
       env: DJANGO_VERSION='Django>=2.1,<2.2'
+    - python: "3.4"
+      env: DJANGO_VERSION='Django>=2.2,<3.0'
+    - python: "3.4"
+      env: DJANGO_VERSION='Django>=3.0'
     - python: "3.4"
       env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
     - python: "3.5"
@@ -50,6 +61,8 @@ matrix:
       env: DJANGO_VERSION='Django>=2.1,<2.2'
     - python: "3.5"
       env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
+    - python: "3.5"
+      env: DJANGO_VERSION='Django>=3.0'
     - python: "3.6"
       env: DJANGO_VERSION='Django>=1.4,<1.5'
     - python: "3.6"
@@ -78,6 +91,24 @@ matrix:
       env: DJANGO_VERSION='Django>=1.9,<1.10'
     - python: "3.7"
       env: DJANGO_VERSION='Django>=1.10,<1.11'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.4,<1.5'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.5,<1.6'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.6,<1.7'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.7,<1.8'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.8,<1.9'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.9,<1.10'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=1.10,<1.11'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=2.0,<2.1'
+    - python: "3.8"
+      env: DJANGO_VERSION='Django>=2.1,<2.2'
 
 install:
   - pip install -q $DJANGO_VERSION

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,11 @@
+0.1.11 (2019-12-19)
+------------------
+
+* Added support for Django 3
+* Added support for Python 3.8
+* Thanks to:
+    * `thijsBoehme  <https://github.com/thijsBoehme>`_
+
 0.1.9 (2019-10-02)
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -49,6 +49,7 @@ def read(*rnames):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     license="LGPL 3",
     keywords="django,multiple,select,field,choices",

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36}-dj{14,15,16,16,17,18,19,110,111},py{34,35,36,37}-dj{14,15,16,16,17,18,19,110,111,20},py{35,36,37}-dj{21,22},
+envlist = py{27,34,35,36}-dj{14,15,16,16,17,18,19,110,111},py{34,35,36,37}-dj{14,15,16,16,17,18,19,110,111,20},py{35,36,37}-dj{21,22},py{38}-dj{22},py{36,37,38}-dj{30}
 
 [testenv]
 usedevelop = True
@@ -200,3 +200,39 @@ deps =
     PyYAML==3.13
     coveralls==0.3
     flake8
+
+[testenv:py38-dj22]
+basepython = python3.8
+deps =
+    django==2.2.1
+    pillow==2.1.0
+    PyYAML==3.13
+    coveralls==0.3
+    flake8
+
+[testenv:py36-dj30]
+basepython = python3.6
+deps =
+    django==3.0
+    pillow==2.1.0
+    PyYAML==3.13
+    coveralls==0.3
+    flake8
+
+[testenv:py37-dj30]
+basepython = python3.6
+deps =
+    django==3.0
+    pillow==2.1.0
+    PyYAML==3.13
+    coveralls==0.3
+    flake8
+
+[testenv:py38-dj30]
+basepython = python3.8
+deps =
+    django==3.0
+    pillow==2.1.0
+    PyYAML==3.13
+    coveralls==0.3
+    flake8