Skip to content

doc/en/Makefile: use Sphinx's make mode #6873

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

Merged
merged 2 commits into from
Mar 7, 2020

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Mar 7, 2020

No description provided.

@blueyed blueyed added type: docs documentation improvement, missing or needing clarification type: enhancement new feature or API change, should be merged into features branch labels Mar 7, 2020
Copy link
Member

@bluetech bluetech left a comment

Choose a reason for hiding this comment

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

IIUC this is regenerating the file from sphinx-quickstart of newer sphinx. It looks good to me except two trivial diffs I noticed.

I also noticed sphinx-quickstart generates a make.bat file which doesn't exit in pytest. Maybe worth adding for the benefit of developers on Windows. Or maybe not...

doc/en/Makefile Outdated
@@ -4,13 +4,20 @@
# You can set these variables from the command line.
SPHINXOPTS =
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
SPHINXOPTS =
SPHINXOPTS ?=

doc/en/Makefile Outdated
@@ -4,13 +4,20 @@
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
SPHINXBUILD = sphinx-build
SPHINXBUILD ?= sphinx-build

@blueyed
Copy link
Contributor Author

blueyed commented Mar 7, 2020

It was synced with/from Sphinx' own Makefile, will check/compare with a fresh one.

@blueyed blueyed merged commit e3cf4fc into pytest-dev:master Mar 7, 2020
@blueyed blueyed deleted the doc-makefile-upstream branch March 7, 2020 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: docs documentation improvement, missing or needing clarification type: enhancement new feature or API change, should be merged into features branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants