FIX: Fixes after rebase

Author: larsoner

doc/conf.py

@@ -83,7 +83,7 @@
 version = re.sub(r'(\d+\.\d+)\.\d+(.*)', r'\1\2', numpydoc.__version__)
 version = re.sub(r'(\.dev\d+).*?$', r'\1', version)
 numpydoc_xref_param_type = True
-numpydoc_xref_ignore = {'optional'}
+numpydoc_xref_ignore = {'optional', 'type_without_description', 'BadException'}
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

numpydoc/docscrape_sphinx.py

@@ -230,10 +230,10 @@ def _str_param_list(self, name, fake_autosummary=False):
                             param_type,
                             self.xref_aliases,
                             self.xref_ignore)
-(??)                    out += self._str_indent(['%s : %s' % (display_param,
-(??)                                                          param.type)])
-(??)                else:
-(??)                    out += self._str_indent([display_param])
+                    out += self._str_indent(['%s : %s' % (display_param,
+                                                          param_type)])
+                else:
+                    out += self._str_indent([display_param])
                 if desc and self.use_blockquotes:
                     out += ['']
                 elif not desc:

numpydoc/tests/test_docscrape.py

@@ -383,11 +383,11 @@ def _strip_blank_lines(s):
     return s
 
 
-def line_by_line_compare(a, b):
+def line_by_line_compare(a, b, n_lines=None):
     a = textwrap.dedent(a)
     b = textwrap.dedent(b)
-    a = [l.rstrip() for l in _strip_blank_lines(a).split('\n')]
-    b = [l.rstrip() for l in _strip_blank_lines(b).split('\n')]
+    a = [l.rstrip() for l in _strip_blank_lines(a).split('\n')][:n_lines]
+    b = [l.rstrip() for l in _strip_blank_lines(b).split('\n')][:n_lines]
     assert len(a) == len(b)
     for ii, (aa, bb) in enumerate(zip(a, b)):
         assert aa == bb
@@ -519,8 +519,7 @@ def test_yield_str():
     The number of bananas.
 int
     The number of unknowns.
-
-.. index:: """)
+""")
 
 
 def test_receives_str():
@@ -538,8 +537,7 @@ def test_receives_str():
     The number of bananas.
 c : int
     The number of oranges.
-
-.. index:: """)
+""")
 
 
 def test_no_index_in_str():
@@ -1186,8 +1184,6 @@ def test_class_members_doc():
     b
     c
 
-    .. index::
-
     """)
 
 
@@ -1371,7 +1367,7 @@ def test_autoclass():
 .. rubric:: Methods
 
 
-    ''')
+    ''', 5)
 
 
 xref_doc_txt = """

numpydoc/tests/test_numpydoc.py

@@ -10,6 +10,9 @@ class MockConfig():
     numpydoc_show_class_members = True
     numpydoc_show_inherited_class_members = True
     numpydoc_class_members_toctree = True
+    numpydoc_xref_param_type = False
+    numpydoc_xref_aliases = {}
+    numpydoc_xref_ignore = set()
     templates_path = []
     numpydoc_edit_link = False
     numpydoc_citation_re = '[a-z0-9_.-]+'
@@ -40,7 +43,7 @@ def test_mangle_docstrings():
     doc = mangle_docstrings(MockApp(), 'class', 'str', str, {'members': ['upper']}, lines)
     assert 'rpartition' not in [x.strip() for x in lines]
     assert 'upper' in [x.strip() for x in lines]
-    
+
     lines = s.split('\n')
     doc = mangle_docstrings(MockApp(), 'class', 'str', str, {'exclude-members': ALL}, lines)
     assert 'rpartition' not in [x.strip() for x in lines]