Merge branch 'release/3.11.2' into master

ets-labs · Feb 22, 2018 · 665b8d0 · 665b8d0
2 parents 13fd1be + c6fd9f3
commit 665b8d0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -120,7 +120,7 @@
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = ['_themes']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
@@ -7,6 +7,11 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+3.11.2
+------
+- Fix padding problem in code samples in docs.
+- Remove ``autodoc`` from the list of documentation dependencies.
+
 3.11.1
 ------
 - Fix small typo in documentation (thanks to James Lafa).

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,3 +4,4 @@ unittest2
 coverage
 flake8
 pydocstyle
+sphinx_autobuild
diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -1,5 +1,3 @@
 sphinx
+sphinx_rtd_theme==0.2.5b2
 -e git://github.com/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus
-sphinx_autobuild
-sphinxcontrib-disqus
-autodoc
diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py
@@ -1,6 +1,6 @@
 """Dependency injector top-level package."""
 
-__version__ = '3.11.1'
+__version__ = '3.11.2'
 """Version number that follows semantic versioning.
 
 :type: str