Skip to content

Commit 5e7d005

Browse files
committed
Don't treat sphinx warnings as errors
Workaround for python/cpython#100520 (rst syntax error in configparser docstrings), which was fixed in CPython 3.10+. Docutils raises warnings about the invalid docstrings, and `-W` instructs sphinx to treat this as errors. We can't control or silence these warnings, so we accept them and don't treat them as errors. See the discussion in #2060 for details.
1 parent 4c7778a commit 5e7d005

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# You can set these variables from the command line.
55
BUILDDIR = build
6-
SPHINXOPTS = -W
6+
SPHINXOPTS =
77
SPHINXBUILD = sphinx-build
88
PAPER =
99

git/config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ def __new__(cls, name: str, bases: Tuple, clsdict: Dict[str, Any]) -> "MetaParse
8787
mutating_methods = clsdict[kmm]
8888
for base in bases:
8989
methods = (t for t in inspect.getmembers(base, inspect.isroutine) if not t[0].startswith("_"))
90-
for name, method in methods:
91-
if name in clsdict:
90+
for method_name, method in methods:
91+
if method_name in clsdict:
9292
continue
9393
method_with_values = needs_values(method)
94-
if name in mutating_methods:
94+
if method_name in mutating_methods:
9595
method_with_values = set_dirty_and_flush_changes(method_with_values)
9696
# END mutating methods handling
9797

98-
clsdict[name] = method_with_values
98+
clsdict[method_name] = method_with_values
9999
# END for each name/method pair
100100
# END for each base
101101
# END if mutating methods configuration is set

0 commit comments

Comments
 (0)