From 0196d774c528a983824073c98899c65a9d1e5417 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Tue, 6 Aug 2024 02:21:06 +0200 Subject: [PATCH 1/2] replace obsolete m2r with sphinx_mdinclude --- docs/conf.py | 2 +- docs/requirements.txt | 3 +-- tox.ini | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index c32af9c03..aa0c4b160 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,7 +41,7 @@ "sphinx.ext.todo", "sphinx.ext.coverage", "rfc", - "m2r", + "sphinx_mdinclude", "sphinx_rtd_theme", ] diff --git a/docs/requirements.txt b/docs/requirements.txt index b47039487..1f6ce464c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,7 +1,6 @@ Django oauthlib>=3.1.0 -m2r>=0.2.1 -mistune<2 +sphinx_mdinclude sphinx==7.2.6 sphinx-rtd-theme==1.3.0 -e . diff --git a/tox.ini b/tox.ini index ba97bd113..ff1626728 100644 --- a/tox.ini +++ b/tox.ini @@ -91,8 +91,7 @@ deps = Jinja2<3.1 sphinx<3 oauthlib>=3.1.0 - m2r>=0.2.1 - mistune<2 + sphinx_mdinclude sphinx-rtd-theme livedocs: sphinx-autobuild jwcrypto From 3bd77e63feccf4d9b863fdaf9fc3076124abd2e2 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Wed, 7 Aug 2024 16:23:29 +0200 Subject: [PATCH 2/2] loosen requirements --- docs/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1f6ce464c..b5550e503 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ Django oauthlib>=3.1.0 sphinx_mdinclude -sphinx==7.2.6 -sphinx-rtd-theme==1.3.0 +sphinx>=7.2.6 +sphinx-rtd-theme>=1.3.0 -e .