Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Sphinx and Docutils #9396

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
{%- block htmltitle %}
{{ super() }}
<link rel="stylesheet" type="text/css" href="{{ pathto('_static/bootstrap.min.css', 1) }}" />
<script type="text/javascript" src="{{ pathto('_static/jquery-1.9.1.min.js', 1)}}"></script>
<script src="/SdkStatic/sdk-priv.js" async="true"></script>
{%- endblock %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ <h3>{{ _('Quick search') }}</h3>
<input type="hidden" name="area" value="default" />
</form>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
<script>document.getElementById('searchbox').style.display = "block";</script>
{%- endif %}

This file was deleted.

21 changes: 6 additions & 15 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
# Newer versions of Jinja break our current copy of Sphinx
# See https://github.com/sphinx-doc/sphinx/issues/10306 for details
jinja2<3.1


docutils>=0.10,<0.17
Sphinx==1.4.9
Jinja2<3.1.0
docutils>=0.18.1,<=0.19
Sphinx==6.2
# Sphinx 6.2.0 requires alabaster>=0.7,<0.8
# Using <0.7.14 since alabaster 0.7.14+ dropped Python 3.8 support
alabaster>0.7,<0.7.14
-e .
# alabaster version 0.7.13 requires Sphinx>1.6
alabaster>0.7,<0.7.13
# Required by Sphinx==1.3.2. (TODO: remove these when upgrading sphinx)
babel<=2.11.0 # via sphinx
pygments<=2.14.0 # via sphinx
pytz<=2022.7 # via babel
snowballstemmer<=2.2.0 # via sphinx
sphinx-rtd-theme<=0.5.2 # via sphinx
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ universal = 0
[metadata]
requires_dist =
botocore==1.37.23
docutils>=0.10,<0.17
docutils>=0.18.1,<=0.19
s3transfer>=0.11.0,<0.12.0
PyYAML>=3.10,<6.1
colorama>=0.2.5,<0.4.7
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def find_version(*file_paths):

install_requires = [
'botocore==1.37.23',
'docutils>=0.10,<0.17',
'docutils>=0.18.1,<=0.19',
's3transfer>=0.11.0,<0.12.0',
'PyYAML>=3.10,<6.1',
'colorama>=0.2.5,<0.4.7',
Expand Down
Loading