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.

Sign up for GitHub

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

Update sphinx version #6415

Merged
merged 5 commits into from
Jan 17, 2024
Merged

Update sphinx version #6415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b88046
Update sphinx version
smburdick Jan 16, 2024
d7697cf
Change language to en for Sphinx
smburdick Jan 16, 2024
3685dbb
Merge branch 'main' into main
smburdick Jan 16, 2024
ab0bf99
Update sphinx config name `master_doc` -> `root_doc`
pavoljuhas Jan 17, 2024
152d47e
Require Sphinx-7.* instead of Sphinx-7.2.*
pavoljuhas Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rtd_docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# -- Project information -----------------------------------------------------

project = 'Cirq'
copyright = '2018-2020, The Cirq Developers' # pylint: disable=redefined-builtin
copyright = '2018-2024, The Cirq Developers' # pylint: disable=redefined-builtin
author = 'The Cirq Developers'

# The short X.Y version
Expand All @@ -51,14 +51,14 @@
source_suffix = {'.rst': 'restructuredtext', '.md': 'markdown'}

# The main toctree document.
master_doc = 'index'
root_doc = 'index'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = 'en'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
13 changes: 1 addition & 12 deletions rtd_docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# For generating documentation.

# TODO(#6400,juhas) - upgrade Sphinx and remove the package pins below -------
alabaster<=0.7.13
sphinxcontrib-applehelp<=1.0.7
sphinxcontrib-devhelp<=1.0.5
sphinxcontrib-htmlhelp<=2.0.4
sphinxcontrib-qthelp<=1.0.6
sphinxcontrib-serializinghtml<=1.1.9
# End of TODO ----------------------------------------------------------------

myst-parser
Sphinx~=3.2.0
Sphinx==7.*
sphinx_rtd_theme
sphinx-notfound-page
Jinja2<=3.0.3
Loading