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

Make sphinx_rtd_theme optional

Browse Source
This commit is contained in:
vitaut
2015-10-16 06:58:12 -07:00
parent 5f09ecd4cf
commit 12dde8afdb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@@ -53,7 +53,6 @@ requires = [
'snowballstemmer>=1.1', 'snowballstemmer>=1.1',
'babel>=1.3,!=2.0', 'babel>=1.3,!=2.0',
'alabaster>=0.7,<0.8', 'alabaster>=0.7,<0.8',
'sphinx_rtd_theme>=0.1,<2.0',
] ]
extras_require = { extras_require = {
# Environment Marker works for wheel 0.24 or later # Environment Marker works for wheel 0.24 or later

9
sphinx/theming.py
View File

@@ -27,7 +27,6 @@ from sphinx import package_dir
from sphinx.errors import ThemeError from sphinx.errors import ThemeError
import alabaster import alabaster
import sphinx_rtd_theme
NODEFAULT = object() NODEFAULT = object()
THEMECONF = 'theme.conf' THEMECONF = 'theme.conf'
@@ -71,7 +70,13 @@ class Theme(object):
@classmethod @classmethod
def load_extra_theme(cls, name): def load_extra_theme(cls, name):
if name in ('alabaster', 'sphinx_rtd_theme'): themes = ['alabaster']
try:
import sphinx_rtd_theme
themes.append('sphinx_rtd_theme')
except ImportError:
pass
if name in themes:
if name == 'alabaster': if name == 'alabaster':
themedir = alabaster.get_path() themedir = alabaster.get_path()
# alabaster theme also requires 'alabaster' extension, it will be loaded # alabaster theme also requires 'alabaster' extension, it will be loaded