Skip to content

Commit

Permalink
Merge branch 'release/3.8.2' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rmk135 committed Nov 30, 2017
2 parents 8cc8c57 + e4275c0 commit bd38c23
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
13 changes: 1 addition & 12 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'sphinx_rtd_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
Expand Down Expand Up @@ -206,17 +206,6 @@
# Output file base name for HTML help builder.
htmlhelp_basename = 'dependency_injectordoc'

# on_rtd is whether we are on readthedocs.org, this line of code grabbed from
# docs.readthedocs.org
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'

if not on_rtd: # only import and set the theme if we're building docs locally
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# otherwise, readthedocs.org uses their theme by default, so no need to
# specify it

# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
Expand Down
4 changes: 4 additions & 0 deletions docs/main/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ that were made in every particular version.
From version 0.7.6 *Dependency Injector* framework strictly
follows `Semantic versioning`_

3.8.2
-----
- Fix padding problem in code samples in docs (part 2).

3.8.1
-----
- Fix padding problem in code samples in docs.
Expand Down
2 changes: 1 addition & 1 deletion src/dependency_injector/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Dependency injector top-level package."""

__version__ = '3.8.1'
__version__ = '3.8.2'
"""Version number that follows semantic versioning.
:type: str
Expand Down

0 comments on commit bd38c23

Please sign in to comment.