From 22b17454d75ac62f783faf9814fdd4c613559484 Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Sat, 8 Jun 2019 14:44:11 -0400 Subject: [PATCH 1/4] docs: build with sphinx < 2.1 sphinx 2.1 adds an ":async:" option for py:method:: and py:function:: and it does not seem to interact well with sphinxcontrib-asyncio --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 97528d9708..852493572b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ -sphinx>1.8.2 +sphinx>1.8.2,<2.1 sphinxcontrib-asyncio sphinx_rtd_theme Twisted From 71494a4db76b3ae458e5757d741bdd1aac255640 Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Sat, 8 Jun 2019 15:02:57 -0400 Subject: [PATCH 2/4] docs: remove sphinxcontrib-asyncio no longer needed since Sphinx-2.1 (and effectively conflicts with it) --- docs/conf.py | 1 - docs/requirements.txt | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index f0cfa9c292..16104266a0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,6 @@ "sphinx.ext.doctest", "sphinx.ext.intersphinx", "sphinx.ext.viewcode", - "sphinxcontrib.asyncio", ] primary_domain = "py" diff --git a/docs/requirements.txt b/docs/requirements.txt index 852493572b..6aff74ed80 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,3 @@ -sphinx>1.8.2,<2.1 -sphinxcontrib-asyncio +sphinx>=2.1 sphinx_rtd_theme Twisted From e19f06d3d422554d5b1823c61e18745ba28aabfb Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Sat, 8 Jun 2019 15:10:12 -0400 Subject: [PATCH 3/4] Revert "docs: remove sphinxcontrib-asyncio" This reverts commit 71494a4db76b3ae458e5757d741bdd1aac255640. --- docs/conf.py | 1 + docs/requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 16104266a0..f0cfa9c292 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,6 +18,7 @@ "sphinx.ext.doctest", "sphinx.ext.intersphinx", "sphinx.ext.viewcode", + "sphinxcontrib.asyncio", ] primary_domain = "py" diff --git a/docs/requirements.txt b/docs/requirements.txt index 6aff74ed80..852493572b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,4 @@ -sphinx>=2.1 +sphinx>1.8.2,<2.1 +sphinxcontrib-asyncio sphinx_rtd_theme Twisted From ecd42b610d88635dbc17cebad70b70289e6b711b Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Sat, 8 Jun 2019 15:10:26 -0400 Subject: [PATCH 4/4] tests: allow failure on python nightly seems to be due to a bunch of asyncio.exceptions.CancelledError --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5ea318f150..d8effe70e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ dist: xenial language: python matrix: fast_finish: true + allow_failures: + - python: nightly addons: apt: packages: