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 pull request #3681 from tk0miya/make_websupport_dependency_optional

Browse Source 
Make websupport dependency optional
This commit is contained in:
Takeshi KOMIYA 2017-04-29 22:59:59 +09:00 committed by GitHub
commit 9d0338777c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -20,6 +20,7 @@ Bugs fixed
* #3661: sphinx-build crashes on parallel build * #3661: sphinx-build crashes on parallel build
* #3669: gettext builder fails with "ValueError: substring not found" * #3669: gettext builder fails with "ValueError: substring not found"
* #3660: Sphinx always depends on sphinxcontrib-websupport and its dependencies
Testing Testing
-------- --------

4
setup.py
View File

@ -51,7 +51,6 @@ requires = [
'alabaster>=0.7,<0.8', 'alabaster>=0.7,<0.8',
'imagesize', 'imagesize',
'requests>=2.0.0', 'requests>=2.0.0',
'sphinxcontrib-websupport',
'typing', 'typing',
'setuptools', 'setuptools',
] ]
@ -60,6 +59,9 @@ extras_require = {
':sys_platform=="win32"': [ ':sys_platform=="win32"': [
'colorama>=0.3.5', 'colorama>=0.3.5',
], ],
'websupport': [
'sphinxcontrib-websupport',
],
'test': [ 'test': [
'pytest', 'pytest',
'mock', # it would be better for 'test:python_version in 2.7' 'mock', # it would be better for 'test:python_version in 2.7'

19
sphinx/websupport/__init__.py
View File

@ -12,11 +12,16 @@
import warnings import warnings
from sphinx.deprecation import RemovedInSphinx20Warning from sphinx.deprecation import RemovedInSphinx20Warning
from sphinxcontrib.websupport import WebSupport # NOQA
from sphinxcontrib.websupport import errors # NOQA
from sphinxcontrib.websupport.search import BaseSearch, SEARCH_ADAPTERS # NOQA
from sphinxcontrib.websupport.storage import StorageBackend # NOQA
warnings.warn('sphinx.websupport module is now provided as sphinxcontrib.webuspport. ' try:
'sphinx.websupport will be removed in Sphinx-2.0. Please use it instaed', from sphinxcontrib.websupport import WebSupport # NOQA
RemovedInSphinx20Warning) from sphinxcontrib.websupport import errors # NOQA
from sphinxcontrib.websupport.search import BaseSearch, SEARCH_ADAPTERS # NOQA
from sphinxcontrib.websupport.storage import StorageBackend # NOQA
warnings.warn('sphinx.websupport module is now provided as sphinxcontrib-webuspport. '
'sphinx.websupport will be removed in Sphinx-2.0. Please use it instaed',
RemovedInSphinx20Warning)
except ImportError:
warnings.warn('Since Sphinx-1.6, sphinx.websupport module is now separated to '
'sphinxcontrib-webuspport package. Please add it into your dependency list.')