From 0ca494e41ff187ef5a0ba8758ee1d201aef6466c Mon Sep 17 00:00:00 2001 From: Kshitij Sobti Date: Fri, 26 May 2023 01:52:13 +0530 Subject: [PATCH] chore: Switch from edx-sphinx-theme to sphinx-book-theme The edx-sphinx theme is being deprecated, and replaced with sphinx-book-theme. This removes references to the deprecated theme and replaces them with the new standard theme for the platform. See openedx/edx-sphinx-theme#184 --- requirements/docs.in | 2 +- requirements/docs.txt | 36 +++++++++++++++++++++++++++--------- requirements/local.txt | 32 +++++++++++++++++++++++++++----- 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/requirements/docs.in b/requirements/docs.in index 2b736be6..5c9c90dd 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,4 +1,4 @@ -c constraints.txt Sphinx -edx-sphinx-theme +sphinx-book-theme diff --git a/requirements/docs.txt b/requirements/docs.txt index ed3464d6..daf3eb9b 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -4,18 +4,24 @@ # # make upgrade # +accessible-pygments==0.0.4 + # via pydata-sphinx-theme alabaster==0.7.13 # via sphinx babel==2.12.1 - # via sphinx + # via + # pydata-sphinx-theme + # sphinx +beautifulsoup4==4.12.2 + # via pydata-sphinx-theme certifi==2023.5.7 # via requests charset-normalizer==3.1.0 # via requests docutils==0.19 - # via sphinx -edx-sphinx-theme==3.1.0 - # via -r requirements/docs.in + # via + # pydata-sphinx-theme + # sphinx idna==3.4 # via requests imagesize==1.4.1 @@ -27,22 +33,32 @@ jinja2==3.1.2 markupsafe==2.1.2 # via jinja2 packaging==23.1 - # via sphinx + # via + # pydata-sphinx-theme + # sphinx +pydata-sphinx-theme==0.13.3 + # via sphinx-book-theme pygments==2.15.1 - # via sphinx + # via + # accessible-pygments + # pydata-sphinx-theme + # sphinx pytz==2023.3 # via babel requests==2.31.0 # via sphinx -six==1.16.0 - # via edx-sphinx-theme snowballstemmer==2.2.0 # via sphinx +soupsieve==2.4.1 + # via beautifulsoup4 sphinx==5.3.0 # via # -c requirements/common_constraints.txt # -r requirements/docs.in - # edx-sphinx-theme + # pydata-sphinx-theme + # sphinx-book-theme +sphinx-book-theme==1.0.1 + # via -r requirements/docs.in sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -55,6 +71,8 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx +typing-extensions==4.6.2 + # via pydata-sphinx-theme urllib3==1.26.16 # via # -c requirements/constraints.txt diff --git a/requirements/local.txt b/requirements/local.txt index 32b505e9..2e0a5798 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -4,6 +4,10 @@ # # make upgrade # +accessible-pygments==0.0.4 + # via + # -r requirements/docs.txt + # pydata-sphinx-theme alabaster==0.7.13 # via # -r requirements/docs.txt @@ -22,7 +26,12 @@ attrs==23.1.0 babel==2.12.1 # via # -r requirements/docs.txt + # pydata-sphinx-theme # sphinx +beautifulsoup4==4.12.2 + # via + # -r requirements/docs.txt + # pydata-sphinx-theme certifi==2023.5.7 # via # -r requirements/docs.txt @@ -129,6 +138,7 @@ djangorestframework==3.14.0 docutils==0.19 # via # -r requirements/docs.txt + # pydata-sphinx-theme # sphinx drf-nested-routers==0.93.4 # via -r requirements/test.txt @@ -146,8 +156,6 @@ edx-django-utils==5.4.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt -edx-sphinx-theme==3.1.0 - # via -r requirements/docs.txt exceptiongroup==1.1.1 # via # -r requirements/test.txt @@ -230,6 +238,7 @@ packaging==23.1 # -r requirements/docs.txt # -r requirements/test.txt # drf-yasg + # pydata-sphinx-theme # pytest # sphinx pbr==5.11.1 @@ -255,11 +264,17 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi +pydata-sphinx-theme==0.13.3 + # via + # -r requirements/docs.txt + # sphinx-book-theme pygments==2.15.1 # via # -r requirements/docs.txt # -r requirements/test.txt + # accessible-pygments # diff-cover + # pydata-sphinx-theme # sphinx pyjwt[crypto]==2.7.0 # via @@ -346,13 +361,11 @@ ruamel-yaml-clib==0.2.7 # ruamel-yaml six==1.16.0 # via - # -r requirements/docs.txt # -r requirements/test.txt # django-dynamic-fixture # edx-auth-backends # edx-django-release-util # edx-lint - # edx-sphinx-theme # python-dateutil snowballstemmer==2.2.0 # via @@ -367,11 +380,18 @@ social-auth-core==4.4.2 # -r requirements/test.txt # edx-auth-backends # social-auth-app-django +soupsieve==2.4.1 + # via + # -r requirements/docs.txt + # beautifulsoup4 sphinx==5.3.0 # via # -c requirements/common_constraints.txt # -r requirements/docs.txt - # edx-sphinx-theme + # pydata-sphinx-theme + # sphinx-book-theme +sphinx-book-theme==1.0.1 + # via -r requirements/docs.txt sphinxcontrib-applehelp==1.0.4 # via # -r requirements/docs.txt @@ -423,10 +443,12 @@ tomlkit==0.11.8 # pylint typing-extensions==4.6.2 # via + # -r requirements/docs.txt # -r requirements/test.txt # asgiref # astroid # mypy + # pydata-sphinx-theme # pylint uritemplate==4.1.1 # via