Merge branch '3.x'

tests/roots/test-api-set-translator/conf.py

@@ -11,7 +11,6 @@ from sphinx.writers.manpage import ManualPageTranslator
 from sphinx.writers.texinfo import TexinfoTranslator
 from sphinx.writers.text import TextTranslator
 
-
 project = 'test'
 
 

tests/roots/test-apidoc-toc/mypackage/main.py

@@ -5,7 +5,6 @@ import os
 import mod_resource
 import mod_something
 
-
 if __name__ == "__main__":
     print("Hello, world! -> something returns: {}".format(mod_something.something()))
 

tests/roots/test-ext-autodoc/autodoc_dummy_module.py

@@ -1,4 +1,4 @@
-from dummy import *   # NOQA
+from dummy import *  # NOQA
 
 
 def test():

tests/roots/test-ext-autodoc/target/__init__.py

@@ -3,7 +3,6 @@ from io import StringIO
 
 from sphinx.util import save_traceback  # NOQA
 
-
 __all__ = ['Class']
 
 #: documentation for the integer

tests/roots/test-ext-autodoc/target/annotations.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from typing import overload
 
+from typing import overload
 
 myint = int
 

tests/roots/test-ext-autodoc/target/generic_class.py

@@ -1,5 +1,4 @@
-from typing import TypeVar, Generic
-
+from typing import Generic, TypeVar
 
 T = TypeVar('T')
 

tests/roots/test-ext-autodoc/target/genericalias.py

@@ -1,4 +1,4 @@
-from typing import List, Callable
+from typing import Callable, List
 
 #: A list of int
 T = List[int]

tests/roots/test-ext-autodoc/target/name_conflict/__init__.py

@@ -1,5 +1,6 @@
 from .foo import bar
 
+
 class foo:
     """docstring of target.name_conflict::foo."""
     pass

tests/roots/test-ext-autodoc/target/need_mocks.py

@@ -1,12 +1,12 @@
 
-import missing_module   # NOQA
-import missing_package1.missing_module1   # NOQA
-from missing_module import missing_name   # NOQA
-from missing_package2 import missing_module2   # NOQA
-from missing_package3.missing_module3 import missing_name   # NOQA
+import missing_module  # NOQA
+import missing_package1.missing_module1  # NOQA
+from missing_module import missing_name  # NOQA
+from missing_package2 import missing_module2  # NOQA
+from missing_package3.missing_module3 import missing_name  # NOQA
 
-import sphinx.missing_module4   # NOQA
-from sphinx.missing_module4 import missing_name2   # NOQA
+import sphinx.missing_module4  # NOQA
+from sphinx.missing_module4 import missing_name2  # NOQA
 
 
 @missing_name

tests/roots/test-ext-autodoc/target/singledispatch.py

@@ -1,5 +1,5 @@
-from functools import singledispatch
 import inspect
+from functools import singledispatch
 
 
 def assign_signature(func):

tests/roots/test-ext-autosummary-imported_members/conf.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('.'))
 
 extensions = ['sphinx.ext.autosummary']

tests/roots/test-ext-autosummary-mock_imports/conf.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('.'))
 
 extensions = ['sphinx.ext.autosummary']

tests/roots/test-ext-autosummary/autosummary_dummy_module.py

@@ -1,7 +1,6 @@
 from os import path  # NOQA
 from typing import Union
 
-
 #: module variable
 CONSTANT1 = None
 CONSTANT2 = None

tests/roots/test-ext-viewcode-find/not_a_package/__init__.py

@@ -1 +1 @@
-from .submodule import func1, Class1  # NOQA
+from .submodule import Class1, func1  # NOQA

tests/roots/test-ext-viewcode/spam/__init__.py

@@ -1,2 +1,2 @@
-from .mod1 import func1, Class1  # NOQA
-from .mod2 import func2, Class2  # NOQA
+from .mod1 import Class1, func1  # NOQA
+from .mod2 import Class2, func2  # NOQA

tests/roots/test-ext-viewcode/spam/mod3.py

@@ -1,2 +1,3 @@
 from spam.mod1 import Class3
+
 __all__ = ('Class3',)

tests/roots/test-prolog/conf.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('.'))
 
 

tests/roots/test-pycode-egg/src/setup.py

@@ -1,5 +1,4 @@
 from setuptools import setup
 
-
 setup(name='sample',
       py_modules=['sample'])

tests/roots/test-root/autodoc_target.py

@@ -1,7 +1,6 @@
 import enum
 from io import StringIO
 
-
 __all__ = ['Class']
 
 #: documentation for the integer

tests/roots/test-root/conf.py

@@ -6,7 +6,6 @@ from docutils.parsers.rst import Directive
 
 from sphinx import addnodes
 
-
 sys.path.append(os.path.abspath('.'))
 
 extensions = ['sphinx.ext.autodoc',

tests/roots/test-theming/setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(
     name='test-theme',

tests/roots/test-warnings/conf.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 sys.path.append(os.path.abspath('.'))
 
 extensions = ['sphinx.ext.autodoc']