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

Jump to bottom

Don't use deprecated setup.py build_sphinx #10352

Merged
merged 2 commits into from
Apr 17, 2022
Merged

Don't use deprecated setup.py build_sphinx #10352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec0c13c
Don't use deprecated `setup.py build_sphinx`
AA-Turner Apr 16, 2022
26e00bd
Merge branch '5.x' into sphinx-docs-build
tk0miya Apr 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ def linkify_issues_in_changelog(app, docname, source):
# this path trickery is needed because this script can
# be invoked with different working directories:
# * running make in docs/
# * running python setup.py build_sphinx in the repo root dir
# * running tox -e docs in the repo root dir

with open(changelog_path) as f:
with open(changelog_path, encoding="utf-8") as f:
Copy link
Member

Choose a reason for hiding this comment

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

Note: This is a bug fix of "our document". So we don't need to mention it on CHANGES.

changelog = f.read()

def linkify(match):
Expand Down
3 changes: 0 additions & 3 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ tag_date = true
release = egg_info -Db ''
upload = upload --sign --identity=36580288

[build_sphinx]
warning-is-error = 1

[extract_messages]
mapping_file = babel.cfg
output_file = sphinx/locale/sphinx.pot
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ description =
extras =
docs
commands =
python setup.py build_sphinx {posargs}
python -m sphinx -M html ./doc ./build/sphinx -W

[testenv:docslint]
basepython = python3
Expand Down