diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 637140df..a079226e 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`_ +4.1.8 +----- +- Update asyncio daemon, single- and multi-container examples to use ``Resource`` provider. + 4.1.7 ----- - Add CI job to build and push documentation to S3 bucket. diff --git a/docs/tutorials/asyncio-daemon.rst b/docs/tutorials/asyncio-daemon.rst index bb5413e5..71aeecf7 100644 --- a/docs/tutorials/asyncio-daemon.rst +++ b/docs/tutorials/asyncio-daemon.rst @@ -226,7 +226,7 @@ Put next lines into the ``containers.py`` file: config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.basicConfig, stream=sys.stdout, level=config.log.level, @@ -270,7 +270,7 @@ Put next lines into the ``__main__.py`` file: if __name__ == '__main__': container = Container() container.config.from_yaml('config.yml') - container.configure_logging() + container.init_resources() main() @@ -421,7 +421,7 @@ Edit ``containers.py``: config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.basicConfig, stream=sys.stdout, level=config.log.level, @@ -461,7 +461,7 @@ Edit ``__main__.py``: if __name__ == '__main__': container = Container() container.config.from_yaml('config.yml') - container.configure_logging() + container.init_resources() container.wire(modules=[sys.modules[__name__]]) main() @@ -562,7 +562,7 @@ Edit ``containers.py``: config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.basicConfig, stream=sys.stdout, level=config.log.level, @@ -667,7 +667,7 @@ Edit ``containers.py``: config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.basicConfig, stream=sys.stdout, level=config.log.level, @@ -766,7 +766,7 @@ Edit ``containers.py``: config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.basicConfig, stream=sys.stdout, level=config.log.level, diff --git a/examples/miniapps/application-multiple-containers/example/__main__.py b/examples/miniapps/application-multiple-containers/example/__main__.py index 926d175b..91ea6267 100644 --- a/examples/miniapps/application-multiple-containers/example/__main__.py +++ b/examples/miniapps/application-multiple-containers/example/__main__.py @@ -24,7 +24,7 @@ def main( if __name__ == '__main__': application = Application() application.config.from_yaml('config.yml') - application.core.configure_logging() + application.core.init_resources() application.wire(modules=[sys.modules[__name__]]) main(*sys.argv[1:]) diff --git a/examples/miniapps/application-multiple-containers/example/containers.py b/examples/miniapps/application-multiple-containers/example/containers.py index 5bcec302..df56129c 100644 --- a/examples/miniapps/application-multiple-containers/example/containers.py +++ b/examples/miniapps/application-multiple-containers/example/containers.py @@ -13,7 +13,7 @@ class Core(containers.DeclarativeContainer): config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.config.dictConfig, config=config.logging, ) diff --git a/examples/miniapps/application-single-container/example/__main__.py b/examples/miniapps/application-single-container/example/__main__.py index 9600fe66..011cb039 100644 --- a/examples/miniapps/application-single-container/example/__main__.py +++ b/examples/miniapps/application-single-container/example/__main__.py @@ -23,7 +23,7 @@ def main( if __name__ == '__main__': container = Container() - container.configure_logging() + container.init_resources() container.config.from_ini('config.ini') container.wire(modules=[sys.modules[__name__]]) diff --git a/examples/miniapps/application-single-container/example/containers.py b/examples/miniapps/application-single-container/example/containers.py index ccc6a2d1..7303b0f4 100644 --- a/examples/miniapps/application-single-container/example/containers.py +++ b/examples/miniapps/application-single-container/example/containers.py @@ -13,7 +13,7 @@ class Container(containers.DeclarativeContainer): config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.config.fileConfig, fname='logging.ini', ) diff --git a/examples/miniapps/asyncio-daemon/monitoringdaemon/__main__.py b/examples/miniapps/asyncio-daemon/monitoringdaemon/__main__.py index c0341357..fe43d1ac 100644 --- a/examples/miniapps/asyncio-daemon/monitoringdaemon/__main__.py +++ b/examples/miniapps/asyncio-daemon/monitoringdaemon/__main__.py @@ -15,7 +15,7 @@ def main(dispatcher: Dispatcher = Provide[Container.dispatcher]) -> None: if __name__ == '__main__': container = Container() container.config.from_yaml('config.yml') - container.configure_logging() + container.init_resources() container.wire(modules=[sys.modules[__name__]]) main() diff --git a/examples/miniapps/asyncio-daemon/monitoringdaemon/containers.py b/examples/miniapps/asyncio-daemon/monitoringdaemon/containers.py index cc134f7b..cfcb3be5 100644 --- a/examples/miniapps/asyncio-daemon/monitoringdaemon/containers.py +++ b/examples/miniapps/asyncio-daemon/monitoringdaemon/containers.py @@ -12,7 +12,7 @@ class Container(containers.DeclarativeContainer): config = providers.Configuration() - configure_logging = providers.Callable( + logging = providers.Resource( logging.basicConfig, stream=sys.stdout, level=config.log.level, diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index 183f4fd7..0561da83 100644 --- a/src/dependency_injector/__init__.py +++ b/src/dependency_injector/__init__.py @@ -1,6 +1,6 @@ """Top-level package.""" -__version__ = '4.1.7' +__version__ = '4.1.8' """Version number. :type: str