Merge 9bcf679a28fdb0b57901622118c37f75c80a06a5 into acaa02eb6b55a2488… · astropy/astroscrappy@d683565

Commit

Merge 9bcf679 into acaa02e

Browse files

bsipocz committed Dec 18, 2016

2 parents acaa02e + 9bcf679 commit d683565

+1 −1		.travis.yml
+14 −2		CHANGES.rst
+4 −0		README.rst
+4 −6		appveyor.yml
+7 −5		astropy_helpers/commands/build_ext.py
+16 −9		astropy_helpers/commands/build_sphinx.py
+10 −3		astropy_helpers/setup_helpers.py
+4 −3		astropy_helpers/sphinx/conf.py
+6 −3		astropy_helpers/sphinx/ext/automodapi.py
+107 −53		astropy_helpers/sphinx/ext/docscrape.py
+21 −11		astropy_helpers/sphinx/ext/docscrape_sphinx.py
+38 −19		astropy_helpers/sphinx/ext/numpydoc.py
+26 −3		astropy_helpers/sphinx/ext/tests/test_automodapi.py
+2 −1		astropy_helpers/sphinx/ext/traitsdoc.py
+ −		astropy_helpers/sphinx/local/python2_local_links.inv
+7 −0		astropy_helpers/sphinx/local/python2_local_links.txt
+ −		astropy_helpers/sphinx/local/python3_local_links.inv
+22 −0		astropy_helpers/sphinx/local/python3_local_links.txt
+1 −0		astropy_helpers/tests/coveragerc
+0 −1		astropy_helpers/tests/test_ah_bootstrap.py
+7 −9		astropy_helpers/tests/test_setup_helpers.py
+253 −199		ez_setup.py
+1 −1		setup.cfg
+3 −3		setup.py