Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 79a95dc

Browse files
xitij2000Feanil Patel
authored andcommitted
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.
1 parent 0dfdd7b commit 79a95dc

8 files changed

Lines changed: 89 additions & 45 deletions

File tree

docs/conf.py

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import os
1717
import re
1818
import sys
19+
from datetime import datetime
1920
from subprocess import check_call
2021

21-
import edx_theme
22+
2223

2324

2425
REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -46,7 +47,6 @@
4647
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4748
# ones.
4849
extensions = [
49-
'edx_theme',
5050
'sphinx.ext.autodoc',
5151
'sphinx.ext.doctest',
5252
'sphinx.ext.intersphinx',
@@ -77,8 +77,8 @@
7777

7878
# General information about the project.
7979
project = 'Open edX Devstack'
80-
copyright = edx_theme.COPYRIGHT # pylint: disable=redefined-builtin
81-
author = edx_theme.AUTHOR
80+
copyright = f'{datetime.now().year}, edX Inc.' # pylint: disable=redefined-builtin
81+
author = 'edX Inc.'
8282
project_title = 'devstack'
8383
documentation_title = "{project_title}".format(project_title=project_title)
8484

@@ -158,16 +158,46 @@
158158
# The theme to use for HTML and HTML Help pages. See the documentation for
159159
# a list of builtin themes.
160160

161-
html_theme = 'edx_theme'
161+
html_theme = 'sphinx_book_theme'
162162

163163
# Theme options are theme-specific and customize the look and feel of a theme
164164
# further. For a list of options available for each theme, see the
165165
# documentation.
166166
#
167-
# html_theme_options = {}
167+
html_theme_options = {
168+
"repository_url": "https://github.com/openedx/devstack",
169+
"repository_branch": "master",
170+
"path_to_docs": "docs/",
171+
"home_page_in_toc": True,
172+
"use_repository_button": True,
173+
"use_issues_button": True,
174+
"use_edit_page_button": True,
175+
# Please don't change unless you know what you're doing.
176+
"extra_footer": """
177+
<a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
178+
<img
179+
alt="Creative Commons License"
180+
style="border-width:0"
181+
src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png"/>
182+
</a>
183+
<br>
184+
These works by
185+
<a
186+
xmlns:cc="https://creativecommons.org/ns#"
187+
href="https://openedx.org"
188+
property="cc:attributionName"
189+
rel="cc:attributionURL"
190+
>The Center for Reimagining Learning</a>
191+
are licensed under a
192+
<a
193+
rel="license"
194+
href="https://creativecommons.org/licenses/by-sa/4.0/"
195+
>Creative Commons Attribution-ShareAlike 4.0 International License</a>.
196+
"""
197+
}
168198

169199
# Add any paths that contain custom themes here, relative to this directory.
170-
html_theme_path = [edx_theme.get_html_theme_path()]
200+
# html_theme_path = []
171201

172202
# The name for this set of Sphinx documents.
173203
# "<project> v<release> documentation" by default.
@@ -181,14 +211,14 @@
181211
# The name of an image file (relative to this directory) to place at the top
182212
# of the sidebar.
183213
#
184-
# html_logo = None
214+
html_logo = "https://logos.openedx.org/open-edx-logo-color.png"
185215

186216
# The name of an image file (relative to this directory) to use as a favicon
187217
# of the docs. This file should be a Windows icon file (.ico) being 16x16
188218
# or 32x32
189219
# pixels large.
190220
#
191-
# html_favicon = None
221+
html_favicon = "https://logos.openedx.org/open-edx-favicon.ico"
192222

193223
# Add any paths that contain custom static files (such as style sheets) here,
194224
# relative to this directory. They are copied after the builtin static files,

requirements/base.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ cffi==1.15.1
1414
# via
1515
# cryptography
1616
# pynacl
17-
charset-normalizer==3.0.1
17+
charset-normalizer==3.1.0
1818
# via requests
19-
cryptography==39.0.1
19+
cryptography==40.0.0
2020
# via paramiko
2121
distro==1.8.0
2222
# via docker-compose
@@ -34,7 +34,7 @@ jsonschema==3.2.0
3434
# via docker-compose
3535
packaging==23.0
3636
# via docker
37-
paramiko==3.0.0
37+
paramiko==3.1.0
3838
# via docker
3939
pycparser==2.21
4040
# via cffi
@@ -59,7 +59,7 @@ six==1.16.0
5959
# websocket-client
6060
texttable==1.6.7
6161
# via docker-compose
62-
urllib3==1.26.14
62+
urllib3==1.26.15
6363
# via
6464
# docker
6565
# requests

requirements/dev.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ cffi==1.15.1
3030
# -r requirements/test.txt
3131
# cryptography
3232
# pynacl
33-
charset-normalizer==3.0.1
33+
charset-normalizer==3.1.0
3434
# via
3535
# -r requirements/base.txt
3636
# -r requirements/test.txt
@@ -39,7 +39,7 @@ click==8.1.3
3939
# via
4040
# -r requirements/pip-tools.txt
4141
# pip-tools
42-
cryptography==39.0.1
42+
cryptography==40.0.0
4343
# via
4444
# -r requirements/base.txt
4545
# -r requirements/test.txt
@@ -70,11 +70,11 @@ docopt==0.6.2
7070
# -r requirements/base.txt
7171
# -r requirements/test.txt
7272
# docker-compose
73-
exceptiongroup==1.1.0
73+
exceptiongroup==1.1.1
7474
# via
7575
# -r requirements/test.txt
7676
# pytest
77-
filelock==3.9.0
77+
filelock==3.10.3
7878
# via
7979
# tox
8080
# virtualenv
@@ -101,16 +101,16 @@ packaging==23.0
101101
# docker
102102
# pytest
103103
# tox
104-
paramiko==3.0.0
104+
paramiko==3.1.0
105105
# via
106106
# -r requirements/base.txt
107107
# -r requirements/test.txt
108108
# docker
109109
pexpect==4.8.0
110110
# via -r requirements/test.txt
111-
pip-tools==6.12.2
111+
pip-tools==6.12.3
112112
# via -r requirements/pip-tools.txt
113-
platformdirs==3.0.0
113+
platformdirs==3.1.1
114114
# via virtualenv
115115
pluggy==1.0.0
116116
# via
@@ -142,7 +142,7 @@ pyrsistent==0.19.3
142142
# -r requirements/base.txt
143143
# -r requirements/test.txt
144144
# jsonschema
145-
pytest==7.2.1
145+
pytest==7.2.2
146146
# via -r requirements/test.txt
147147
python-dotenv==0.21.1
148148
# via
@@ -188,21 +188,21 @@ tox==3.28.0
188188
# tox-battery
189189
tox-battery==0.6.1
190190
# via -r requirements/dev.in
191-
urllib3==1.26.14
191+
urllib3==1.26.15
192192
# via
193193
# -r requirements/base.txt
194194
# -r requirements/test.txt
195195
# docker
196196
# requests
197-
virtualenv==20.20.0
197+
virtualenv==20.21.0
198198
# via tox
199199
websocket-client==0.59.0
200200
# via
201201
# -r requirements/base.txt
202202
# -r requirements/test.txt
203203
# docker
204204
# docker-compose
205-
wheel==0.38.4
205+
wheel==0.40.0
206206
# via
207207
# -r requirements/pip-tools.txt
208208
# pip-tools

requirements/doc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
-r base.txt # Core dependencies for this package
55

66
doc8 # reStructuredText style checker
7-
edx_sphinx_theme # edX theme for Sphinx output
7+
sphinx-book-theme # Common theme for all Open edX projects
88
readme_renderer # Validates README.rst for usage on PyPI
99
Sphinx # Documentation builder

requirements/doc.txt

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@
44
#
55
# make upgrade
66
#
7+
accessible-pygments==0.0.4
8+
# via pydata-sphinx-theme
79
alabaster==0.7.13
810
# via sphinx
911
attrs==22.2.0
1012
# via
1113
# -r requirements/base.txt
1214
# jsonschema
1315
babel==2.12.1
14-
# via sphinx
16+
# via
17+
# pydata-sphinx-theme
18+
# sphinx
1519
bcrypt==4.0.1
1620
# via
1721
# -r requirements/base.txt
1822
# paramiko
23+
beautifulsoup4==4.12.0
24+
# via pydata-sphinx-theme
1925
bleach==6.0.0
2026
# via readme-renderer
2127
certifi==2022.12.7
@@ -27,11 +33,11 @@ cffi==1.15.1
2733
# -r requirements/base.txt
2834
# cryptography
2935
# pynacl
30-
charset-normalizer==3.0.1
36+
charset-normalizer==3.1.0
3137
# via
3238
# -r requirements/base.txt
3339
# requests
34-
cryptography==39.0.1
40+
cryptography==40.0.0
3541
# via
3642
# -r requirements/base.txt
3743
# paramiko
@@ -58,18 +64,17 @@ docopt==0.6.2
5864
docutils==0.19
5965
# via
6066
# doc8
67+
# pydata-sphinx-theme
6168
# readme-renderer
6269
# restructuredtext-lint
6370
# sphinx
64-
edx-sphinx-theme==3.1.0
65-
# via -r requirements/doc.in
6671
idna==3.4
6772
# via
6873
# -r requirements/base.txt
6974
# requests
7075
imagesize==1.4.1
7176
# via sphinx
72-
importlib-metadata==6.0.0
77+
importlib-metadata==6.1.0
7378
# via sphinx
7479
jinja2==3.1.2
7580
# via sphinx
@@ -83,8 +88,9 @@ packaging==23.0
8388
# via
8489
# -r requirements/base.txt
8590
# docker
91+
# pydata-sphinx-theme
8692
# sphinx
87-
paramiko==3.0.0
93+
paramiko==3.1.0
8894
# via
8995
# -r requirements/base.txt
9096
# docker
@@ -94,9 +100,13 @@ pycparser==2.21
94100
# via
95101
# -r requirements/base.txt
96102
# cffi
103+
pydata-sphinx-theme==0.13.1
104+
# via sphinx-book-theme
97105
pygments==2.14.0
98106
# via
107+
# accessible-pygments
99108
# doc8
109+
# pydata-sphinx-theme
100110
# readme-renderer
101111
# sphinx
102112
pynacl==1.5.0
@@ -132,16 +142,20 @@ six==1.16.0
132142
# -r requirements/base.txt
133143
# bleach
134144
# dockerpty
135-
# edx-sphinx-theme
136145
# jsonschema
137146
# websocket-client
138147
snowballstemmer==2.2.0
139148
# via sphinx
149+
soupsieve==2.4
150+
# via beautifulsoup4
140151
sphinx==5.3.0
141152
# via
142153
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
143154
# -r requirements/doc.in
144-
# edx-sphinx-theme
155+
# pydata-sphinx-theme
156+
# sphinx-book-theme
157+
sphinx-book-theme==1.0.0
158+
# via -r requirements/doc.in
145159
sphinxcontrib-applehelp==1.0.4
146160
# via sphinx
147161
sphinxcontrib-devhelp==1.0.2
@@ -162,7 +176,7 @@ texttable==1.6.7
162176
# docker-compose
163177
tomli==2.0.1
164178
# via doc8
165-
urllib3==1.26.14
179+
urllib3==1.26.15
166180
# via
167181
# -r requirements/base.txt
168182
# docker

requirements/pip-tools.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ click==8.1.3
1010
# via pip-tools
1111
packaging==23.0
1212
# via build
13-
pip-tools==6.12.2
13+
pip-tools==6.12.3
1414
# via -r requirements/pip-tools.in
1515
pyproject-hooks==1.0.0
1616
# via build
1717
tomli==2.0.1
1818
# via build
19-
wheel==0.38.4
19+
wheel==0.40.0
2020
# via pip-tools
2121

2222
# The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# make upgrade
66
#
7-
wheel==0.38.4
7+
wheel==0.40.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
1111
pip==23.0.1
1212
# via -r requirements/pip.in
13-
setuptools==67.4.0
13+
setuptools==67.6.0
1414
# via -r requirements/pip.in

0 commit comments

Comments
 (0)