Merge branch 'master' into develop

This commit is contained in:
Roman Mogylatov 2018-02-22 15:46:31 +02:00
commit f62b977093
5 changed files with 15 additions and 4 deletions

View File

@ -0,0 +1,3 @@
.rst-content .highlight>pre, .rst-content .linenodiv>pre {
line-height: normal;
}

View File

@ -117,10 +117,10 @@ html_theme = 'sphinx_rtd_theme'
# Theme options are theme-specific and customize the look and feel of a theme # Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the # further. For a list of options available for each theme, see the
# documentation. # documentation.
#html_theme_options = {} # html_context = {}
# Add any paths that contain custom themes here, relative to this directory. # Add any paths that contain custom themes here, relative to this directory.
html_theme_path = ['_themes'] #html_theme_path = ['_themes']
# The name for this set of Sphinx documents. If None, it defaults to # The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation". # "<project> v<release> documentation".
@ -290,3 +290,7 @@ texinfo_documents = [
autodoc_member_order = 'bysource' autodoc_member_order = 'bysource'
disqus_shortname = 'python-dependency-injector' disqus_shortname = 'python-dependency-injector'
def setup(app):
app.add_stylesheet('sphinx_rtd_theme-hotfix.css')

View File

@ -7,6 +7,10 @@ that were made in every particular version.
From version 0.7.6 *Dependency Injector* framework strictly From version 0.7.6 *Dependency Injector* framework strictly
follows `Semantic versioning`_ follows `Semantic versioning`_
3.11.3
------
- Fix padding problem in code samples in docs.
3.11.2 3.11.2
------ ------
- Fix padding problem in code samples in docs. - Fix padding problem in code samples in docs.

View File

@ -1,3 +1,3 @@
sphinx sphinx
sphinx_rtd_theme==0.2.5b2 sphinx_rtd_theme>=0.2.5b2
-e git://github.com/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus -e git://github.com/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus

View File

@ -1,6 +1,6 @@
"""Dependency injector top-level package.""" """Dependency injector top-level package."""
__version__ = '3.11.2' __version__ = '3.11.3'
"""Version number that follows semantic versioning. """Version number that follows semantic versioning.
:type: str :type: str