Merge branch '3.3.x' into 3.x

.github/workflows/main.yml

@@ -8,8 +8,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [py36, py37]
+        name: [py35, py36, py37]
         include:
+        - name: py35
+          python: 3.5
+          docutils: du12
         - name: py36
           python: 3.6
           docutils: du13

.travis.yml

@@ -11,9 +11,6 @@ env:
 
 jobs:
   include:
-    - python: '3.5'
-      env:
-        - TOXENV=du12
     - python: '3.8'
       env:
         - TOXENV=du15

tests/test_ext_autodoc.py

@@ -1832,6 +1832,13 @@ def test_autodoc_for_egged_code(app):
 def test_singledispatch(app):
     options = {"members": None}
     actual = do_autodoc(app, 'module', 'target.singledispatch', options)
+    if sys.version_info < (3, 6):
+        # check the result via "in" because the order of singledispatch signatures is
+        # usually changed (because dict is not OrderedDict yet!)
+        assert '.. py:function:: func(arg, kwarg=None)' in actual
+        assert '                 func(arg: int, kwarg=None)' in actual
+        assert '                 func(arg: str, kwarg=None)' in actual
+    else:
         assert list(actual) == [
             '',
             '.. py:module:: target.singledispatch',

tests/test_ext_autodoc_autofunction.py

@@ -9,6 +9,8 @@
     :license: BSD, see LICENSE for details.
 """
 
+import sys
+
 import pytest
 
 from test_ext_autodoc import do_autodoc
@@ -108,6 +110,13 @@ def test_decorated(app):
 def test_singledispatch(app):
     options = {}
     actual = do_autodoc(app, 'function', 'target.singledispatch.func', options)
+    if sys.version_info < (3, 6):
+        # check the result via "in" because the order of singledispatch signatures is
+        # usually changed (because dict is not OrderedDict yet!)
+        assert '.. py:function:: func(arg, kwarg=None)' in actual
+        assert '                 func(arg: int, kwarg=None)' in actual
+        assert '                 func(arg: str, kwarg=None)' in actual
+    else:
         assert list(actual) == [
             '',
             '.. py:function:: func(arg, kwarg=None)',