Merge branch 'main' into master

eliottrosenberg · Jan 17, 2024 · 42d776f · 42d776f
2 parents 9f1d9fc + 9c451a2
commit 42d776f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/rtd_docs/conf.py b/rtd_docs/conf.py
@@ -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
@@ -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.

diff --git a/rtd_docs/requirements.txt b/rtd_docs/requirements.txt
@@ -1,8 +1,5 @@
 # For generating documentation.
-# TODO(#6400,juhas) - upgrade Sphinx and remove the alabaster pin below
-alabaster<=0.7.13
 myst-parser
-Sphinx~=3.2.0
+Sphinx==7.*
 sphinx_rtd_theme
 sphinx-notfound-page
-Jinja2<=3.0.3