Commit Graph

8221 Commits

Author SHA1 Message Date
Lilian Besson
c7c4f8f0f4 Prevent a TypeError bug for get_full_modname()
It prevents this bug:
```python
viewcode can't import None, failed with error "__import__() argument 1 must be str, not None"
Traceback (most recent call last):
  File "/usr/local/lib/python3.5/dist-packages/sphinx/ext/viewcode.py", line 28, in _get_full_modname
    return get_full_modname(modname, attribute)
  File "/usr/local/lib/python3.5/dist-packages/sphinx/util/__init__.py", line 263, in get_full_modname
    __import__(modname)
TypeError: __import__() argument 1 must be str, not None
```
2017-03-10 10:04:13 +01:00
Takeshi KOMIYA
ef56a3c116 Merge pull request #3529 from tk0miya/make_env.app_available_always
Make env.app available always
2017-03-10 00:45:18 +09:00
Takeshi KOMIYA
6251d0d83b Merge branch 'master' into make_env.app_available_always 2017-03-10 00:45:10 +09:00
Takeshi KOMIYA
e76ec05b5b Merge pull request #3531 from tk0miya/initialize_i18n_earlier
Initialize i18n module earlier
2017-03-10 00:43:50 +09:00
Takeshi KOMIYA
022bc1ed62 Update CHANGES 2017-03-10 00:31:43 +09:00
Takeshi KOMIYA
15114e596d Initialize i18n module earlier 2017-03-09 12:23:23 +09:00
Takeshi KOMIYA
70a8c737c1 Do not clear `app.env` 2017-03-08 23:34:04 +09:00
Jean-François B
0063446c1a Merge pull request #3525 from jfbu/syncfootnotehyper
Sync with 1.0 footnotehyper
2017-03-08 10:32:31 +01:00
Takeshi KOMIYA
142344ceed Merge pull request #3523 from anntzer/makefile-use--msphinx
Default SPHINXBUILD to 'python -msphinx' instead of 'sphinx-build'.
2017-03-08 15:56:34 +09:00
Takeshi KOMIYA
c7bec75bcd BuildEnvironment always own application object (after read phase) 2017-03-08 12:23:25 +09:00
Takeshi KOMIYA
a523f9893a Add load(), loads(), dump() and dumps() to BuildEnvironment 2017-03-08 12:23:25 +09:00
jfbu
c42db788d0 Sync with 1.0 footnotehyper
Since #3022 (Sphinx 1.5) more footnotes are hyperlinked but it became
impossible for Sphinx user to pass option ``hyperfootnotes=false`` to
package ``hyperref``. Release 1.0 of LaTeX package ``footnotehyper``,
which serves as bugfix replacement to older package ``footnote``, is
compatible with ``hyperfootnotes=false``, hence it is again possible to
Sphinx user to completely disable hyperlinking of footnotes, if ever
needed.
2017-03-07 19:06:23 +01:00
Takeshi KOMIYA
5ee4c396bc Merge branch 'stable' 2017-03-08 00:22:39 +09:00
Jakob Lykke Andersen
38b38d8aff Make flake8 stop complaining. 2017-03-07 20:47:53 +09:00
Jakob Lykke Andersen
bc527c533e C++, better error messages for 'func' and 'any' refs.
Followup to sphinx-dox/sphinx#2952.
On error try to get reparse without parens to get the correct message.
2017-03-07 20:28:04 +09:00
Takeshi KOMIYA
e060f65bc5 Merge pull request #3519 from agjohnson/add-domain-tests
Add tests for xrefs on Python and JavaScript domains
2017-03-07 11:20:32 +09:00
Antony Lee
0832aa73ab Default SPHINXBUILD to 'python -msphinx' instead of 'sphinx-build'.
Using `python -msphinx` as the default for SPHINXBUILD in the
Makefile/make.bat ensures that whatever virtual environment is currently
active (if any) gets picked up.  In the current situation, imaging that
we are working on project $foo which is also installed system-wide,
but we want to build docs for a venv-installed version; that sphinx
is installed system-wide but not in the current environment, and that
e.g. conf.py imports $foo (e.g. to retrieve a version string).  Then
sphinx-build will resolve to the globally installed version, and the
global (wrong) version of $foo will be imported as well.

With this fix, `make html` will do everything in the correct virtualenv
(if any).  This switch is similar in spirit to e.g. the deprecation of
the `pyvenv` script in Py3.6, in favor of `python -mvenv`.
2017-03-06 18:16:27 -08:00
Anthony Johnson
3502336b13
Add tests for xrefs on Python and JavaScript domains
These are just the passing test cases for the domains currently. I am going to
patch up issues with nesting on both domains to start, so these are the test
cases I'll be testing against. I'll see about addressing the other core
domains, or at very least the cpp domain, with similar tests if this looks
okay.

So far, these tests only test against methods/functions for the basic nesting
structure. More complete tests will test additional domain roles.

Refs #662
2017-03-05 16:00:25 -08:00
jfbu
6fda42f214 Reword a CHANGES entry for 1.6 (refs #3466) 2017-03-05 10:35:02 +01:00
Takeshi KOMIYA
125b224d80 Merge pull request #3509 from abathur/html_depart_admonition
Fix #3506: consistently pass node to depart_admonition in HTML writer
2017-03-05 17:38:41 +09:00
Travis A. Everett
fde43061e5 clean up commented lines 2017-03-04 20:58:43 -06:00
Travis A. Everett
4c67c110f6 Also change depart_admonition calls for html5 builder 2017-03-04 20:32:46 -06:00
Travis A. Everett
1e28eeb348 swing two for oldstyle class 2017-03-04 15:56:06 -06:00
Travis A. Everett
b6694c9ca1 Make super call version-agnostic 2017-03-04 14:27:41 -06:00
Travis A. Everett
cabfcbd70d Fix #3506: consistently pass node to depart_admonition in HTML writer 2017-03-04 13:40:05 -06:00
jfbu
79a49805eb Add xcolor to Travis requirements for testing (refs #3070) 2017-03-04 18:56:55 +01:00
jfbu
bfaab9b45d Stop bundling LaTeX package needspace with Sphinx (refs #3070) 2017-03-04 18:55:24 +01:00
jfbu
91ec5a8012 Update CHANGES for PR#3504 2017-03-04 18:50:08 +01:00
Jean-François B
469d261abb Merge pull request #3504 from jfbu/fixtablevspaces
Fix #3491 via equalizing vertical spaces for latex tables of all types
2017-03-04 18:24:49 +01:00
jfbu
64a45053af Rename to `\shinxbelowcaptionspace` 2017-03-04 18:09:33 +01:00
jfbu
07fa4246a3 Reduce after table space 2017-03-04 16:25:21 +01:00
jfbu
0882a41f24 Rename and simplify LaTeX macros
in particular:
``\sphinxbelowtablecaptionskip`` renamed to ``\sphinxbelowcaptionskip``
as it may be extended in future to usage for captions of literal blocks.
2017-03-04 16:09:49 +01:00
jfbu
5f71a2ccb3 Fix #3491 via equalizing vertical spaces for latex tables of all types
User interface via macros ``\sphinxtablepre``, ``\sphinxtablepost``
and ``\sphinxbelowtablecaptionskip``.
2017-03-04 00:08:02 +01:00
Takeshi KOMIYA
000c11ef9d Merge pull request #3493 from tk0miya/refactor_inventory
Refactor inventory
2017-03-04 01:59:35 +09:00
Takeshi KOMIYA
432ec25d9c Fix for py3 2017-03-04 01:03:29 +09:00
Takeshi KOMIYA
3ba24fb6b8 Fix mypy violation 2017-03-04 00:26:21 +09:00
Takeshi KOMIYA
e655794b8e Merge branch 'master' into refactor_inventory 2017-03-04 00:22:17 +09:00
Takeshi KOMIYA
ffb627db89 Merge branch 'master' into refactor_inventory 2017-03-04 00:13:39 +09:00
Takeshi KOMIYA
7cb655d7cd Update testcase 2017-03-04 00:02:38 +09:00
Takeshi KOMIYA
f97eb91581 Merge pull request #3502 from tk0miya/3499_upgrade_mypy
Upgrade to mypy-0.5
2017-03-04 00:01:31 +09:00
Takeshi KOMIYA
45f1253e34 Fix flake8 violation 2017-03-03 23:55:53 +09:00
Takeshi KOMIYA
f32ec6533d Fix flake8 violation 2017-03-03 23:42:35 +09:00
Takeshi KOMIYA
8d35024c6c Fix mypy violation 2017-03-03 23:34:52 +09:00
Takeshi KOMIYA
554199d30e Upgrade to mypy-0.5 2017-03-03 23:17:34 +09:00
Takeshi KOMIYA
28b1aceefe Merge pull request #3495 from shibukawa/fix/html5_validation_error
fix HTML5 validation check (role attribute of body tag is unnecessary)
2017-03-03 23:04:47 +09:00
Takeshi KOMIYA
2a37b0e340 Allow to replace table templates for LaTeX by user's 2017-03-03 22:48:44 +09:00
Takeshi KOMIYA
8aa2588275 Merge pull request #3501 from shibukawa/fix/type_style_check
fix style check warnings
2017-03-03 22:46:34 +09:00
Yoshiki Shibukawa
7e178785a7 fix style check warnings 2017-03-03 22:03:16 +09:00
jfbu
c112f60d47 Fix mypy violations after merge of 'stable'
modified:   sphinx/builders/gettext.py
2017-03-03 11:11:49 +01:00
jfbu
179a769490 Fix other error in merging 'stable'
modified:   sphinx/ext/intersphinx.py
2017-03-03 11:05:04 +01:00