From d0566ba702b9aab9fa6f500aae921856279dae02 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Sat, 11 Apr 2020 22:13:32 +0200
Subject: [PATCH 1/3] Add more environments

---
 tox.ini | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index 53e026d..1d7d735 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,21 +2,24 @@
 envlist =
   docs
   py27-sphinx{17,18}
-  py{36,37}-sphinx{17,18,20,21,22}
+  py{36,37,38}-sphinx{17,18,20,21,22,23,24,30}
 
 [testenv]
 deps =
   pytest
   pdbpp
   .
-  sphinx17: sphinx==1.7.9
-  sphinx18: sphinx==1.8.5
-  sphinx20: sphinx==2.0.1
-  sphinx21: sphinx==2.1.2
-  sphinx22: sphinx==2.2.0
+  sphinx17: sphinx~=1.7.0
+  sphinx18: sphinx~=1.8.0
+  sphinx20: sphinx~=2.0.0
+  sphinx21: sphinx~=2.1.0
+  sphinx22: sphinx~=2.2.0
+  sphinx23: sphinx~=2.3.0
+  sphinx24: sphinx~=2.4.0
+  sphinx30: sphinx~=3.0.0
 commands = pytest {posargs}
 
-[testenv:py37-sphinx21]
+[testenv:py38-sphinx30]
 deps =
   {[testenv]deps}
   pytest-cov

From 56d80b06365defd11da9328bbccc455bed67a8d0 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Sat, 11 Apr 2020 22:21:00 +0200
Subject: [PATCH 2/3] Adapt tests for 2.4.x that removes the redundant `type=`
 in script

---
 tests/test_urls.py | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/tests/test_urls.py b/tests/test_urls.py
index 8c514fb..6095378 100644
--- a/tests/test_urls.py
+++ b/tests/test_urls.py
@@ -447,17 +447,31 @@ def test_sphinx_resource_urls(app, status, warning):
 
     content = open(path).read()
 
-    chunks = [
-        # Sphinx's resources URLs
-        '<script type="text/javascript" src="/en/latest/_static/jquery.js"></script>',
-        '<script type="text/javascript" src="/en/latest/_static/underscore.js"></script>',
-        '<script type="text/javascript" src="/en/latest/_static/doctools.js"></script>',
-    ]
+    if sphinx.version_info < (2, 4, 0):
+        chunks = [
+            # Sphinx's resources URLs
+            '<script type="text/javascript" src="/en/latest/_static/jquery.js"></script>',
+            '<script type="text/javascript" src="/en/latest/_static/underscore.js"></script>',
+            '<script type="text/javascript" src="/en/latest/_static/doctools.js"></script>',
+        ]
+    else:
+        # #6925: html: Remove redundant type="text/javascript" from <script> elements
+        chunks = [
+            # Sphinx's resources URLs
+            '<script src="/en/latest/_static/jquery.js"></script>',
+            '<script src="/en/latest/_static/underscore.js"></script>',
+            '<script src="/en/latest/_static/doctools.js"></script>',
+        ]
 
     if sphinx.version_info >= (1, 8):
-        chunks.append(
-            '<script type="text/javascript" src="/en/latest/_static/language_data.js"></script>',
-        )
+        if sphinx.version_info < (2, 4, 0):
+            chunks.append(
+                '<script type="text/javascript" src="/en/latest/_static/language_data.js"></script>',
+            )
+        else:
+            chunks.append(
+                '<script src="/en/latest/_static/language_data.js"></script>',
+            )
 
     for chunk in chunks:
         assert chunk in content

From 799b67b9dcdd9af319c5fdfb75dc1a155e628145 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Sat, 11 Apr 2020 22:22:11 +0200
Subject: [PATCH 3/3] Python3.8

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 33e69a9..494a792 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.6
   - 3.7
+  - 3.8
 install:
   pip install tox-travis
 script: