diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 20:06:48 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 20:06:48 -0700 |
| commit | 629a2d4daa376e5639ad5106289c77b8137f9f15 (patch) | |
| tree | 4e5678c1a966b7c24fd0a715982eb30301880ccb /numpy/core/defchararray.py | |
| parent | 4b361f62be7f750dc385d0b7dc7529ad9af5e4ea (diff) | |
| parent | 9d8722b5bc76ecb2fe74a8e8dd3a7b1c2c83985b (diff) | |
| download | numpy-629a2d4daa376e5639ad5106289c77b8137f9f15.tar.gz | |
Merge branch 'enh-numpydoc'
There were some conflicts with the 2to3 work in numpy. I think I got the
fixes right.
* enh-numpydoc:
DOC: fix doc/source/conf.py to work with Python 3
BUG: numpydoc: check that it works with sub-classes
TST: numpydoc: more class tests
BUG: numpydoc: fix bugs in attribute docstring extraction + improve presentation
TST: numpydoc: add stub test files, to check that files at least import
MAINT: always use plot directive from Matplotlib, and prefer Sphinx linkcode
ENH: numpydoc: Python 2 & 3 in single codebase, restructure as a package
ENH: numpydoc: deal with duplicated signatures
DOC: numpydoc/linkcode: mention that the extension will be in Sphinx upstream
BUG: numpydoc/linkcode: do not detect linkcode config changes
Conflicts:
doc/sphinxext/numpydoc/docscrape.py
doc/sphinxext/numpydoc/docscrape_sphinx.py
doc/sphinxext/numpydoc/linkcode.py
doc/sphinxext/numpydoc/phantom_import.py
doc/sphinxext/numpydoc/traitsdoc.py
Diffstat (limited to 'numpy/core/defchararray.py')
0 files changed, 0 insertions, 0 deletions