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' into 4617_quickstart_argument_required

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-02-17 14:45:34 +09:00 committed by GitHub
commit 27d51cb406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.codecov.yml Normal file
View File

@ -0,0 +1,6 @@
coverage:
status:
patch:
default:
# allowed to drop X% and still result in a "success" commit status
threshold: 0.05

2
CHANGES
View File

@ -19,6 +19,8 @@ Bugs fixed
* #4608: epub: Invalid meta tag is generated * #4608: epub: Invalid meta tag is generated
* #4260: autodoc: keyword only argument separator is not disappeared if it is * #4260: autodoc: keyword only argument separator is not disappeared if it is
appeared at top of the argument list appeared at top of the argument list
* #4622: epub: :confval:`epub_scheme` does not effect to content.opf
* #4627: graphviz: Fit graphviz images to page
* #4617: quickstart: PROJECT_DIR argument is required * #4617: quickstart: PROJECT_DIR argument is required
Testing Testing

2
sphinx/ext/graphviz.py
View File

@ -341,7 +341,7 @@ def render_dot_latex(self, node, code, options, prefix='graphviz'):
post = r'\hspace*{\fill}}' post = r'\hspace*{\fill}}'
self.body.append('\n%s' % pre) self.body.append('\n%s' % pre)
self.body.append(r'\includegraphics{%s}' % fname) self.body.append(r'\sphinxincludegraphics[]{%s}' % fname)
if not is_inline: if not is_inline:
self.body.append('%s\n' % post) self.body.append('%s\n' % post)

2
sphinx/templates/epub3/content.opf_t
View File

@ -11,7 +11,7 @@
<dc:contributor>{{ contributor }}</dc:contributor> <dc:contributor>{{ contributor }}</dc:contributor>
<dc:publisher>{{ publisher }}</dc:publisher> <dc:publisher>{{ publisher }}</dc:publisher>
<dc:rights>{{ copyright }}</dc:rights> <dc:rights>{{ copyright }}</dc:rights>
<dc:identifier id="{{ uid }}">{{ id }}</dc:identifier> <dc:identifier id="{{ uid }}" opf:scheme="{{ scheme }}">{{ id }}</dc:identifier>
<dc:date>{{ date }}</dc:date> <dc:date>{{ date }}</dc:date>
<meta property="dcterms:modified">{{ date }}</meta> <meta property="dcterms:modified">{{ date }}</meta>
<meta property="ibooks:version">{{ version }}</meta> <meta property="ibooks:version">{{ version }}</meta>

3
tests/test_build_latex.py
View File

@ -767,7 +767,8 @@ def test_image_in_section(app, status, warning):
assert ('\\chapter{Another section}' in result) assert ('\\chapter{Another section}' in result)
@pytest.mark.sphinx('latex', confoverrides={'latex_logo': 'notfound.jpg'}) @pytest.mark.sphinx('latex', testroot='basic',
confoverrides={'latex_logo': 'notfound.jpg'})
def test_latex_logo_if_not_found(app, status, warning): def test_latex_logo_if_not_found(app, status, warning):
try: try:
app.builder.build_all() app.builder.build_all()

8
tests/test_ext_graphviz.py
View File

@ -91,20 +91,20 @@ def test_graphviz_latex(app, status, warning):
content = (app.outdir / 'SphinxTests.tex').text() content = (app.outdir / 'SphinxTests.tex').text()
macro = ('\\\\begin{figure}\\[htbp\\]\n\\\\centering\n\\\\capstart\n\n' macro = ('\\\\begin{figure}\\[htbp\\]\n\\\\centering\n\\\\capstart\n\n'
'\\\\includegraphics{graphviz-\\w+.pdf}\n' '\\\\sphinxincludegraphics\\[\\]{graphviz-\\w+.pdf}\n'
'\\\\caption{caption of graph}\\\\label{.*}\\\\end{figure}') '\\\\caption{caption of graph}\\\\label{.*}\\\\end{figure}')
assert re.search(macro, content, re.S) assert re.search(macro, content, re.S)
macro = 'Hello \\\\includegraphics{graphviz-\\w+.pdf} graphviz world' macro = 'Hello \\\\sphinxincludegraphics\\[\\]{graphviz-\\w+.pdf} graphviz world'
assert re.search(macro, content, re.S) assert re.search(macro, content, re.S)
macro = ('\\\\begin{wrapfigure}{r}{0pt}\n\\\\centering\n' macro = ('\\\\begin{wrapfigure}{r}{0pt}\n\\\\centering\n'
'\\\\includegraphics{graphviz-\\w+.pdf}\n' '\\\\sphinxincludegraphics\\[\\]{graphviz-\\w+.pdf}\n'
'\\\\caption{on right}\\\\label{.*}\\\\end{wrapfigure}') '\\\\caption{on right}\\\\label{.*}\\\\end{wrapfigure}')
assert re.search(macro, content, re.S) assert re.search(macro, content, re.S)
macro = (r'\{\\hfill' macro = (r'\{\\hfill'
r'\\includegraphics{graphviz-.*}' r'\\sphinxincludegraphics\[\]{graphviz-.*}'
r'\\hspace\*{\\fill}}') r'\\hspace\*{\\fill}}')
assert re.search(macro, content, re.S) assert re.search(macro, content, re.S)

2
tests/test_ext_inheritance_diagram.py
View File

@ -40,7 +40,7 @@ def test_inheritance_diagram_latex(app, status, warning):
content = (app.outdir / 'Python.tex').text() content = (app.outdir / 'Python.tex').text()
pattern = ('\\\\begin{figure}\\[htbp]\n\\\\centering\n\\\\capstart\n\n' pattern = ('\\\\begin{figure}\\[htbp]\n\\\\centering\n\\\\capstart\n\n'
'\\\\includegraphics{inheritance-\\w+.pdf}\n' '\\\\sphinxincludegraphics\\[\\]{inheritance-\\w+.pdf}\n'
'\\\\caption{Test Foo!}\\\\label{\\\\detokenize{index:id1}}\\\\end{figure}') '\\\\caption{Test Foo!}\\\\label{\\\\detokenize{index:id1}}\\\\end{figure}')
assert re.search(pattern, content, re.M) assert re.search(pattern, content, re.M)