From f50144a40bea898146e9d9409b57209adbcac095 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 9 Mar 2020 12:56:09 +0100
Subject: [PATCH 1/2] Unpin pytest

Was done in https://github.com/sphinx-doc/sphinx/pull/7037 to work
around a bug in 5.3.3.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index bb6273033..43f197566 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ extras_require = {
         'docutils-stubs',
     ],
     'test': [
-        'pytest < 5.3.3',
+        'pytest',
         'pytest-cov',
         'html5lib',
         'typed_ast',  # for py35-37

From d28b3a2ffe2372e935b079165ac84f8c1343efd4 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 9 Mar 2020 13:13:39 +0100
Subject: [PATCH 2/2] Fix warnings with Travis config

> Build config validation
> root: deprecated key sudo (The key `sudo` has no effect anymore.)
> jobs.include.node_js: unexpected sequence, using the first value (10.7)
> root: missing os, using the default linux
> root: key matrix is an alias for jobs, using jobs
---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 008f4e442..3ceb2e3f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
-language: python
-sudo: false
+os: linux
 dist: xenial
+language: python
 cache: pip
 
 env:
@@ -9,7 +9,7 @@ env:
     - SKIP_LATEX_BUILD=1
     - IS_PYTHON=true
 
-matrix:
+jobs:
   include:
     - python: '3.5'
       env:
@@ -37,8 +37,7 @@ matrix:
       env: TOXENV=flake8
 
     - language: node_js
-      node_js:
-        - 10.7
+      node_js: '10.7'
       env: IS_PYTHON=false
       services: xvfb