Merge branch 'release/4.33.0' into master

Author: rmk135

docs/main/changelog.rst

@@ -7,6 +7,17 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+4.33.0
+------
+- Add support of default value for environment variable in INI and YAML
+  configuration files with ``${ENV_NAME:default}`` format.
+  See issue `#459 <https://github.com/ets-labs/python-dependency-injector/issues/459>`_.
+  Thanks to `Maksym Shemet @hbmshemet <https://github.com/hbmshemet>`_ for suggesting the feature.
+- Add method ``Configuration.from_value()``.
+  See issue `#462 <https://github.com/ets-labs/python-dependency-injector/issues/462>`_.
+  Thanks to Mr. `Slack Clone <https://disqus.com/by/slackclone/>`_  for bringing it up
+  in the comments for configuration provider docs.
+
 4.32.3
 ------
 - This fix a typo in ``di_in_python.rst`` doc.

docs/providers/configuration.rst

@@ -5,7 +5,7 @@ Configuration provider
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Configuration,Injection,
-              Option,Ini,Json,Yaml,Pydantic,Dict,Environment Variable,Load,Read,Get
+              Option,Ini,Json,Yaml,Pydantic,Dict,Environment Variable,Default,Load,Read,Get
    :description: Configuration provides configuration options to the other providers. This page
                  demonstrates how to use Configuration provider to inject the dependencies, load
                  a configuration from an ini or yaml file, a dictionary, an environment variable,
@@ -43,8 +43,18 @@ where ``examples/providers/configuration/config.ini`` is:
    :language: ini
 
 :py:meth:`Configuration.from_ini` method supports environment variables interpolation. Use
-``${ENV_NAME}`` format in the configuration file to substitute value of the environment
-variable ``ENV_NAME``.
+``${ENV_NAME}`` format in the configuration file to substitute value from ``ENV_NAME`` environment
+variable.
+
+You can also specify a default value using ``${ENV_NAME:default}`` format. If environment
+variable ``ENV_NAME`` is undefined, configuration provider will substitute value ``default``.
+
+.. code-block:: ini
+
+   [section]
+   option1 = {$ENV_VAR}
+   option2 = {$ENV_VAR}/path
+   option3 = {$ENV_VAR:default}
 
 Loading from a YAML file
 ------------------------
@@ -62,12 +72,22 @@ where ``examples/providers/configuration/config.yml`` is:
 .. literalinclude:: ../../examples/providers/configuration/config.yml
    :language: ini
 
-:py:meth:`Configuration.from_yaml` method uses custom version of ``yaml.SafeLoader``.
+:py:meth:`Configuration.from_yaml` method supports environment variables interpolation. Use
+``${ENV_NAME}`` format in the configuration file to substitute value from ``ENV_NAME`` environment
+variable.
+
+You can also specify a default value using ``${ENV_NAME:default}`` format. If environment
+variable ``ENV_NAME`` is undefined, configuration provider will substitute value ``default``.
+
+.. code-block:: ini
 
-The loader supports environment variables interpolation. Use ``${ENV_NAME}`` format
-in the configuration file to substitute value of the environment variable ``ENV_NAME``.
+   section:
+     option1: {$ENV_VAR}
+     option2: {$ENV_VAR}/path
+     option3: {$ENV_VAR:default}
 
-You can also specify a YAML loader as an argument:
+:py:meth:`Configuration.from_yaml` method uses custom version of ``yaml.SafeLoader``.
+To use another loader use ``loader`` argument:
 
 .. code-block:: python
 
@@ -144,6 +164,17 @@ Loading from an environment variable
    :lines: 3-
    :emphasize-lines: 18-20
 
+Loading a value
+---------------
+
+``Configuration`` provider can load configuration value using the
+:py:meth:`Configuration.from_value` method:
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_value.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 14-15
+
 Loading from the multiple sources
 ---------------------------------
 

examples/providers/configuration/configuration_value.py

@@ -0,0 +1,24 @@
+"""`Configuration` provider values loading example."""
+
+from datetime import date
+
+from dependency_injector import containers, providers
+
+
+class Container(containers.DeclarativeContainer):
+
+    config = providers.Configuration()
+
+
+if __name__ == '__main__':
+    container = Container()
+
+    container.config.option1.from_value(date(2021, 6, 13))
+    container.config.option2.from_value(date(2021, 6, 14))
+
+    assert container.config() == {
+        'option1': date(2021, 6, 13),
+        'option2': date(2021, 6, 14),
+    }
+    assert container.config.option1() == date(2021, 6, 13)
+    assert container.config.option2() == date(2021, 6, 14)

src/dependency_injector/__init__.py

@@ -1,6 +1,6 @@
 """Top-level package."""
 
-__version__ = '4.32.3'
+__version__ = '4.33.0'
 """Version number.
 
 :type: str