Merge branch 'master' into eol-djangos

Author: matthiask

.travis.yml

@@ -1,14 +1,11 @@
-dist: xenial
 language: python
 cache: pip
 matrix:
   fast_finish: true
   include:
     - env: TOXENV=flake8
-    - python: 3.7
-      env: TOXENV=style
-    - python: 3.7
-      env: TOXENV=readme
+    - env: TOXENV=style
+    - env: TOXENV=readme
     - python: 3.5
       env: TOXENV=py35-dj111
     - python: 3.6
@@ -21,20 +18,24 @@ matrix:
       env: TOXENV=py36-dj22
     - python: 3.7
       env: TOXENV=py37-dj22
+    - python: 3.8
+      env: TOXENV=py38-dj22
     - python: 3.6
       env: TOXENV=py36-dj30
     - python: 3.7
       env: TOXENV=py37-dj30
+    - python: 3.8
+      env: TOXENV=py38-dj30
     - python: 3.6
       env: TOXENV=py36-djmaster
     - python: 3.7
       env: TOXENV=py37-djmaster
-    - python: 3.7
-      env: TOXENV=postgresql
+    - python: 3.8
+      env: TOXENV=py38-djmaster
+    - env: TOXENV=postgresql
       addons:
         postgresql: "9.5"
-    - python: 3.7
-      env: TOXENV=mariadb
+    - env: TOXENV=mariadb
       addons:
         mariadb: "10.3"
       script:
@@ -47,6 +48,7 @@ matrix:
   allow_failures:
     - env: TOXENV=py36-djmaster
     - env: TOXENV=py37-djmaster
+    - env: TOXENV=py38-djmaster
 
 install:
   - pip install tox codecov

docs/changes.rst

@@ -5,6 +5,7 @@ UNRELEASED
 ----------
 
 * Removed support for end of life Django 2.0 and 2.1.
+* Added support for Python 3.8.
 
 2.1 (2019-11-12)
 ----------------

tests/panels/test_sql.py

@@ -1,6 +1,7 @@
 import datetime
 import unittest
 
+import django
 from django.contrib.auth.models import User
 from django.db import connection
 from django.db.models import Count
@@ -108,10 +109,16 @@ def test_param_conversion(self):
         # ensure query was logged
         self.assertEqual(len(self.panel._queries), 3)
 
-        self.assertEqual(
-            tuple([q[1]["params"] for q in self.panel._queries]),
-            ('["Foo", true, false]', "[10, 1]", '["2017-12-22 16:07:01"]'),
-        )
+        if django.VERSION >= (3, 1):
+            self.assertEqual(
+                tuple([q[1]["params"] for q in self.panel._queries]),
+                ('["Foo"]', "[10, 1]", '["2017-12-22 16:07:01"]'),
+            )
+        else:
+            self.assertEqual(
+                tuple([q[1]["params"] for q in self.panel._queries]),
+                ('["Foo", true, false]', "[10, 1]", '["2017-12-22 16:07:01"]'),
+            )
 
     def test_binary_param_force_text(self):
         self.assertEqual(len(self.panel._queries), 0)

tox.ini

@@ -4,17 +4,17 @@ envlist =
     style
     readme
     py{35,36,37}-dj111
-    py{35,36,37}-dj22
-    py{36,37}-dj30
-    py{36,37}-djmaster
+    py{35,36,37,38}-dj22
+    py{36,37,38}-dj30
+    py{36,37,38}-djmaster
     postgresql
     mariadb
 
 [testenv]
 deps =
     dj111: Django==1.11.*
     dj22: Django==2.2.*
-    dj30: Django>=3.0b1,<3.1
+    dj30: Django==3.0.*
     djmaster: https://github.com/django/django/archive/master.tar.gz
     coverage
     Jinja2