From de7b38626b06caa93c3af4d84b1625e455855160 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Fri, 26 Jan 2018 19:34:38 +0200 Subject: [PATCH 1/5] Release/3.11.1 -> Develop (#181) * Specify sphix version * Fix small typo in documentation (#180) * Bump version to 3.11.1 * Complement the list of contributors --- CONTRIBUTORS.rst | 2 ++ docs/main/changelog.rst | 4 ++++ docs/providers/dependency.rst | 2 +- src/dependency_injector/__init__.py | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 61d50989..5dab5c90 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -4,3 +4,5 @@ Dependency Injector Contributors + Roman Mogilatov (rmk135) + Konstantin vz'One Enchant (sirkonst) + Terrence Brannon (metaperl) ++ Stanislav Lobanov (asyncee) ++ James Lafa (jameslafa) diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 816d279c..8e834b0a 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -7,6 +7,10 @@ that were made in every particular version. From version 0.7.6 *Dependency Injector* framework strictly follows `Semantic versioning`_ +3.11.1 +------ +- Fix small typo in documentation (thanks to James Lafa). + 3.11.0 ------ - Improve ``Configuration`` provider overriding logic. diff --git a/docs/providers/dependency.rst b/docs/providers/dependency.rst index 0833373a..0da99e9d 100644 --- a/docs/providers/dependency.rst +++ b/docs/providers/dependency.rst @@ -33,7 +33,7 @@ Example: DBAPI 2.0 database connection. Being a self-sufficient library, ``UsersService`` doesn't hardcode any kind of database management logic. Instead of this, ``UsersService`` has external dependency, that has to - be satisfied by cleint's code, out of library's scope. + be satisfied by client's code, out of library's scope. .. image:: /images/providers/dependency.png diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index c1fe5ecb..f8228f9f 100644 --- a/src/dependency_injector/__init__.py +++ b/src/dependency_injector/__init__.py @@ -1,6 +1,6 @@ """Dependency injector top-level package.""" -__version__ = '3.11.0' +__version__ = '3.11.1' """Version number that follows semantic versioning. :type: str From 403e406d4ab996c9eee18f407152bbf360fc49ed Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 22 Feb 2018 11:41:42 +0200 Subject: [PATCH 2/5] Bump version to 3.11.2 --- src/dependency_injector/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index f8228f9f..5268b5b0 100644 --- 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 From e81b459656d5e93bb4dd06860908bbbd582c3e5c Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 22 Feb 2018 11:42:06 +0200 Subject: [PATCH 3/5] Update list of documentation and development requirements --- requirements-dev.txt | 1 + requirements-doc.txt | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e2752a4e..537818f7 100644 --- 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 index 5378d2c3..921bae57 100644 --- 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 From bdbb9b40dee0f77b8325f3c4680ea9f3e8d69eb4 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 22 Feb 2018 11:42:45 +0200 Subject: [PATCH 4/5] Specify dir for sphinx themes explicitly --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 8a6452d1..ad266d5b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -120,7 +120,7 @@ html_theme = 'sphinx_rtd_theme' #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 # " v documentation". From c6fd9f3cb85b8eec70684d91cdaffc70d50bd1ca Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 22 Feb 2018 11:43:08 +0200 Subject: [PATCH 5/5] Update changelog for 3.11.2 --- docs/main/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 8e834b0a..50ee3c10 100644 --- 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).