Skip to content

Conversation

@kolea2
Copy link
Collaborator

@kolea2 kolea2 commented May 21, 2020

Fixes #570

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label May 21, 2020
@kolea2
Copy link
Collaborator Author

kolea2 commented May 21, 2020

@crwilcox PTAL


session.install('-e', '.')
session.install('sphinx<3.0.0', 'alabaster', 'recommonmark')
session.install('sphinx', 'alabaster', 'recommonmark')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@crwilcox IIRC, you needed a specific version of sphinx. Will this break you?

Copy link
Collaborator Author

@kolea2 kolea2 May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We made this change here: googleapis/python-bigtable#20 and the docs build passed successfully, so we wanted to make this change more broadly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kolea2 is correct. A contributor made this change to bigtable specifically. And it seems @frankyn has had the same experience for storage specifically. This change undoes a mitigation while we were incompatible with newer versions of sphinx.

"sphinx.ext.napoleon",
"sphinx.ext.todo",
"sphinx.ext.viewcode",
"recommonmark",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did the same change in python-storage: googleapis/python-storage#103

Didn't realize it came from this parent template. The rationale for it:

https://github.com/readthedocs/recommonmark

# for Sphinx-1.4 or newer
extensions = ['recommonmark'] # <---- this 

# for Sphinx-1.3
from recommonmark.parser import CommonMarkParser

source_parsers = {
    '.md': CommonMarkParser,
}

source_suffix = ['.rst', '.md']

@kolea2
Copy link
Collaborator Author

kolea2 commented May 26, 2020

@SurferJeffAtGoogle do you mind merging this? I don't have access :)

@busunkim96 busunkim96 merged commit 71b8a27 into googleapis:master May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update sphinx conf.py for > 3.0.0

6 participants