Merge branch '2.0' into 6574_annotation_for_varidic_params

sphinx-doc · Aug 2, 2019 · b436760 · b436760
2 parents b3eb853 + 04fbd51
commit b436760
Show file tree

Hide file tree

Showing 10 changed files with 859 additions and 510 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
  - TOXENV=du13
  - python: '3.7'
  env:
- - TOXENV=py37
+ - TOXENV=du14
  - PYTEST_ADDOPTS="--cov ./ --cov-append --cov-config setup.cfg"
  - python: 'nightly'
  env: TOXENV=py38

diff --git a/CHANGES b/CHANGES
@@ -51,6 +51,7 @@ Bugs fixed
 * #6574: autodoc: :confval:`autodoc_member_order` does not refer order of
  imports when ``'bysource'`` order
 * #6574: autodoc: missing type annotation for variadic and keyword parameters
+* #6589: autodoc: Formatting issues with autodoc_typehints='none'
 * #6498: autosummary: crashed with wrong autosummary_generate setting
 * #6507: autosummary: crashes without no autosummary_generate setting
 * #6511: LaTeX: autonumbered list can not be customized in LaTeX

diff --git a/sphinx/ext/imgmath.py b/sphinx/ext/imgmath.py
@@ -104,7 +104,7 @@ def read_svg_depth(filename: str) -> int:
  return None
 
 
-def write_svg_depth(filename: str, depth:int) -> None:
+def write_svg_depth(filename: str, depth: int) -> None:
  """Write the depth to SVG file as a comment at end of file
  """
  with open(filename, 'a') as f: