[Numpy-svn] [numpy/numpy] cedba8: BUG: numpydoc/linkcode: do not detect linkcode con...

GitHub noreply@github....
Thu Feb 28 21:09:47 CST 2013


  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: cedba8efabdcbbeb338a0683cf91b755ab5f9e5c
      https://github.com/numpy/numpy/commit/cedba8efabdcbbeb338a0683cf91b755ab5f9e5c
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/linkcode.py

  Log Message:
  -----------
  BUG: numpydoc/linkcode: do not detect linkcode config changes

Since the linkcode_resolve is a function, it triggers configuration
change on each rebuild, resulting to full rebuild always. It's better
to make it not do that.


  Commit: c5cb18f9486c5e6291e476890a3b6bef1424062c
      https://github.com/numpy/numpy/commit/c5cb18f9486c5e6291e476890a3b6bef1424062c
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/linkcode.py

  Log Message:
  -----------
  DOC: numpydoc/linkcode: mention that the extension will be in Sphinx upstream


  Commit: a4cd4ffd52b4b60df4e8752ea202862e2c386589
      https://github.com/numpy/numpy/commit/a4cd4ffd52b4b60df4e8752ea202862e2c386589
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/docscrape.py
    M doc/sphinxext/tests/test_docscrape.py

  Log Message:
  -----------
  ENH: numpydoc: deal with duplicated signatures


  Commit: 7f2da39dea8f869ea4d5256786f55eacbd5722e6
      https://github.com/numpy/numpy/commit/7f2da39dea8f869ea4d5256786f55eacbd5722e6
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/MANIFEST.in
    R doc/sphinxext/__init__.py
    R doc/sphinxext/comment_eater.py
    R doc/sphinxext/compiler_unparse.py
    R doc/sphinxext/docscrape.py
    R doc/sphinxext/docscrape_sphinx.py
    R doc/sphinxext/linkcode.py
    R doc/sphinxext/numpydoc.py
    A doc/sphinxext/numpydoc/__init__.py
    A doc/sphinxext/numpydoc/comment_eater.py
    A doc/sphinxext/numpydoc/compiler_unparse.py
    A doc/sphinxext/numpydoc/docscrape.py
    A doc/sphinxext/numpydoc/docscrape_sphinx.py
    A doc/sphinxext/numpydoc/linkcode.py
    A doc/sphinxext/numpydoc/numpydoc.py
    A doc/sphinxext/numpydoc/phantom_import.py
    A doc/sphinxext/numpydoc/plot_directive.py
    A doc/sphinxext/numpydoc/tests/test_docscrape.py
    A doc/sphinxext/numpydoc/traitsdoc.py
    R doc/sphinxext/phantom_import.py
    R doc/sphinxext/plot_directive.py
    M doc/sphinxext/setup.py
    R doc/sphinxext/tests/test_docscrape.py
    R doc/sphinxext/traitsdoc.py

  Log Message:
  -----------
  ENH: numpydoc: Python 2 & 3 in single codebase, restructure as a package


  Commit: cc832530ef784723953dcb3ae943d95da6afb557
      https://github.com/numpy/numpy/commit/cc832530ef784723953dcb3ae943d95da6afb557
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/source/conf.py

  Log Message:
  -----------
  MAINT: always use plot directive from Matplotlib, and prefer Sphinx linkcode


  Commit: c5efee88abd79f2338b28267377fe31be7dfa0f4
      https://github.com/numpy/numpy/commit/c5efee88abd79f2338b28267377fe31be7dfa0f4
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    A doc/sphinxext/numpydoc/tests/test_linkcode.py
    A doc/sphinxext/numpydoc/tests/test_phantom_import.py
    A doc/sphinxext/numpydoc/tests/test_plot_directive.py
    A doc/sphinxext/numpydoc/tests/test_traitsdoc.py

  Log Message:
  -----------
  TST: numpydoc: add stub test files, to check that files at least import


  Commit: fd9064f5ee734ffb1dd1f16e7b0f6ce9cfa25df5
      https://github.com/numpy/numpy/commit/fd9064f5ee734ffb1dd1f16e7b0f6ce9cfa25df5
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/numpydoc/docscrape.py
    M doc/sphinxext/numpydoc/docscrape_sphinx.py

  Log Message:
  -----------
  BUG: numpydoc: fix bugs in attribute docstring extraction + improve presentation


  Commit: 1b2e585133c555d1b5f72c5598473a7568587645
      https://github.com/numpy/numpy/commit/1b2e585133c555d1b5f72c5598473a7568587645
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/numpydoc/tests/test_docscrape.py

  Log Message:
  -----------
  TST: numpydoc: more class tests


  Commit: a3bc1467dee14dd4726a83af2fb1a4cb89cbf53b
      https://github.com/numpy/numpy/commit/a3bc1467dee14dd4726a83af2fb1a4cb89cbf53b
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

  Changed paths:
    M doc/sphinxext/numpydoc/docscrape.py
    M doc/sphinxext/numpydoc/tests/test_docscrape.py

  Log Message:
  -----------
  BUG: numpydoc: check that it works with sub-classes


  Commit: 9d8722b5bc76ecb2fe74a8e8dd3a7b1c2c83985b
      https://github.com/numpy/numpy/commit/9d8722b5bc76ecb2fe74a8e8dd3a7b1c2c83985b
  Author: Pauli Virtanen <pav@iki.fi>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M doc/source/conf.py

  Log Message:
  -----------
  DOC: fix doc/source/conf.py to work with Python 3


  Commit: 629a2d4daa376e5639ad5106289c77b8137f9f15
      https://github.com/numpy/numpy/commit/629a2d4daa376e5639ad5106289c77b8137f9f15
  Author: Charles Harris <charlesr.harris@gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M doc/source/conf.py
    M doc/sphinxext/MANIFEST.in
    R doc/sphinxext/__init__.py
    R doc/sphinxext/comment_eater.py
    R doc/sphinxext/compiler_unparse.py
    R doc/sphinxext/docscrape.py
    R doc/sphinxext/docscrape_sphinx.py
    R doc/sphinxext/linkcode.py
    R doc/sphinxext/numpydoc.py
    A doc/sphinxext/numpydoc/__init__.py
    A doc/sphinxext/numpydoc/comment_eater.py
    A doc/sphinxext/numpydoc/compiler_unparse.py
    A doc/sphinxext/numpydoc/docscrape.py
    A doc/sphinxext/numpydoc/docscrape_sphinx.py
    A doc/sphinxext/numpydoc/linkcode.py
    A doc/sphinxext/numpydoc/numpydoc.py
    A doc/sphinxext/numpydoc/phantom_import.py
    A doc/sphinxext/numpydoc/plot_directive.py
    A doc/sphinxext/numpydoc/tests/test_docscrape.py
    A doc/sphinxext/numpydoc/tests/test_linkcode.py
    A doc/sphinxext/numpydoc/tests/test_phantom_import.py
    A doc/sphinxext/numpydoc/tests/test_plot_directive.py
    A doc/sphinxext/numpydoc/tests/test_traitsdoc.py
    A doc/sphinxext/numpydoc/traitsdoc.py
    R doc/sphinxext/phantom_import.py
    R doc/sphinxext/plot_directive.py
    M doc/sphinxext/setup.py
    R doc/sphinxext/tests/test_docscrape.py
    R doc/sphinxext/traitsdoc.py

  Log Message:
  -----------
  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


Compare: https://github.com/numpy/numpy/compare/4b361f62be7f...629a2d4daa37


More information about the Numpy-svn mailing list