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 'stable'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-01-07 15:36:55 +09:00
commit 5c72b8cf47
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -53,6 +53,11 @@ Deprecated
Release 1.5.2 (in development) Release 1.5.2 (in development)
=============================== ===============================
Incompatible changes
--------------------
* Dependency requirement updates: requests 2.4.0 or above (refs: #3268, #3310)
Features added Features added
-------------- --------------
@ -73,6 +78,7 @@ Bugs fixed
* The warning type ``misc.highlighting_failure`` does not work * The warning type ``misc.highlighting_failure`` does not work
* #3294: ``add_latex_package()`` make crashes non-LaTeX builders * #3294: ``add_latex_package()`` make crashes non-LaTeX builders
* The caption of table are rendered as invalid HTML (refs: #3287) * The caption of table are rendered as invalid HTML (refs: #3287)
* #3268: Sphinx crashes with requests package from Debian jessie
Release 1.5.1 (released Dec 13, 2016) Release 1.5.1 (released Dec 13, 2016)

2
setup.py
View File

@ -50,7 +50,7 @@ requires = [
'babel>=1.3,!=2.0', 'babel>=1.3,!=2.0',
'alabaster>=0.7,<0.8', 'alabaster>=0.7,<0.8',
'imagesize', 'imagesize',
'requests', 'requests>=2.4.0',
'typing', 'typing',
] ]
extras_require = { extras_require = {

7
sphinx/util/requests.py
View File

@ -17,7 +17,12 @@ import pkg_resources
from six import string_types from six import string_types
from six.moves.urllib.parse import urlsplit from six.moves.urllib.parse import urlsplit
from requests.packages.urllib3.exceptions import SSLError, InsecureRequestWarning try:
from requests.packages.urllib3.exceptions import SSLError, InsecureRequestWarning
except ImportError:
# python-requests package in Debian jessie does not provide ``requests.packages.urllib3``.
# So try to import the exceptions from urllib3 package.
from urllib3.exceptions import SSLError, InsecureRequestWarning
# try to load requests[security] # try to load requests[security]
try: try:

6
tox.ini
View File

@ -4,7 +4,7 @@ envlist=flake8,py27,py34,py35,py36,pypy,du13,du12,du11
[testenv] [testenv]
deps= deps=
six six
nose pytest
sqlalchemy sqlalchemy
whoosh whoosh
html5lib html5lib
@ -15,7 +15,7 @@ setenv =
SPHINX_TEST_TEMPDIR = {envdir}/testbuild SPHINX_TEST_TEMPDIR = {envdir}/testbuild
PYTHONDONTWRITEBYTECODE = true PYTHONDONTWRITEBYTECODE = true
commands= commands=
{envpython} -Wall tests/run.py --ignore-files=test_autodoc_py35 -m '^[tT]est' {posargs} {envpython} -Wall tests/run.py --ignore tests/py35 {posargs}
sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html
[testenv:pypy] [testenv:pypy]
@ -52,5 +52,5 @@ deps=
typed_ast typed_ast
{[testenv]deps} {[testenv]deps}
commands= commands=
{envpython} -Wall tests/run.py -m '^[tT]est' {posargs} {envpython} -Wall tests/run.py {posargs}
sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html sphinx-build -q -W -b html -d {envtmpdir}/doctrees doc {envtmpdir}/html