IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7-release' into 3952_rst_too_escaped

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-01-28 19:24:06 +09:00 committed by GitHub
commit 922d0df286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -26,6 +26,7 @@ Bugs fixed
* #4472: DOCUMENTATION_OPTIONS is not defined * #4472: DOCUMENTATION_OPTIONS is not defined
* #4491: autodoc: prefer _MockImporter over other importers in sys.meta_path * #4491: autodoc: prefer _MockImporter over other importers in sys.meta_path
* #4490: autodoc: type annotation is broken with python 3.7.0a4+ * #4490: autodoc: type annotation is broken with python 3.7.0a4+
* utils package is installed
* #3952: apidoc: module header is too escaped * #3952: apidoc: module header is too escaped
Testing Testing

2
setup.cfg
View File

@ -37,6 +37,8 @@ exclude = .git,.tox,.venv,tests/*,build/*,doc/_build/*,sphinx/search/*,sphinx/py
[flake8:local-plugins] [flake8:local-plugins]
extension = extension =
X101 = utils.checks:sphinx_has_header X101 = utils.checks:sphinx_has_header
paths =
.
[mypy] [mypy]
python_version = 2.7 python_version = 2.7

2
setup.py
View File

@ -214,7 +214,7 @@ setup(
'Topic :: Utilities', 'Topic :: Utilities',
], ],
platforms='any', platforms='any',
packages=find_packages(exclude=['tests']), packages=find_packages(exclude=['tests', 'utils']),
include_package_data=True, include_package_data=True,
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [