From: Adrian Moennich Date: Tue, 11 May 2021 22:18:42 +0000 (+0200) Subject: Install sphinx 4.1-dev from git X-Git-Tag: 3.0.1~7^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5323b241494778b88fe45d6860f4dcc4aab79a5;p=thirdparty%2Fjinja.git Install sphinx 4.1-dev from git Otherwise docs builds are broken due to sphinx-doc/sphinx#9216 --- diff --git a/requirements/dev.txt b/requirements/dev.txt index ba711bdd..0dbc2bc8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -36,12 +36,10 @@ imagesize==1.2.0 # via sphinx iniconfig==1.1.1 # via pytest -jinja2==2.11.3 +jinja2==3.0.0 # via sphinx -markupsafe==1.1.1 - # via - # jinja2 - # sphinx +markupsafe==2.0.0 + # via jinja2 mypy-extensions==0.4.3 # via mypy mypy==0.812 @@ -90,7 +88,7 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx==4.0.1 +git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # via # -r requirements/docs.in # pallets-sphinx-themes diff --git a/requirements/docs.in b/requirements/docs.in index 7ec501b6..f1cac6e4 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,4 +1,4 @@ Pallets-Sphinx-Themes -Sphinx +git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # https://github.com/sphinx-doc/sphinx/issues/9216 sphinx-issues sphinxcontrib-log-cabinet diff --git a/requirements/docs.txt b/requirements/docs.txt index cd36ee5e..ec9cfcb6 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -18,12 +18,10 @@ idna==2.10 # via requests imagesize==1.2.0 # via sphinx -jinja2==2.11.3 +jinja2==3.0.0 # via sphinx -markupsafe==1.1.1 - # via - # jinja2 - # sphinx +markupsafe==2.0.0 + # via jinja2 packaging==20.9 # via # pallets-sphinx-themes @@ -42,7 +40,7 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx==4.0.1 +git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # via # -r requirements/docs.in # pallets-sphinx-themes