Merge branch 'release/4.18.0' into master

Author: rmk135

Makefile

@@ -52,7 +52,7 @@ test-py2: build
 	coverage report --rcfile=./.coveragerc
 	coverage html --rcfile=./.coveragerc
 
-test-py3: build
+test: build
 	# Unit tests with coverage report
 	coverage erase
 	coverage run --rcfile=./.coveragerc -m unittest2 discover -s tests/unit/ -p test_*py3*.py

docs/containers/index.rst

@@ -23,4 +23,5 @@ Containers module API docs - :py:mod:`dependency_injector.containers`.
     dynamic
     specialization
     overriding
+    reset_singletons
     traversal

docs/containers/reset_singletons.rst

@@ -0,0 +1,19 @@
+Reset container singletons
+--------------------------
+
+To reset all container singletons use method ``.reset_singletons()``.
+
+.. literalinclude:: ../../examples/containers/reset_singletons.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 16
+
+Method ``.reset_singletons()`` also resets singletons in sub-containers: ``providers.Container`` and
+``providers.DependenciesContainer.``
+
+.. literalinclude:: ../../examples/containers/reset_singletons_subcontainers.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 21
+
+.. disqus::

docs/main/changelog.rst

@@ -7,6 +7,15 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+4.18.0
+------
+- Add ``container.reset_singleton()`` method to reset container singletons.
+- Refactor ``container.apply_container_providers_overridings()`` to use ``container.traverse()``.
+  This enables deep lazy initialization of ``Container`` providers.
+- Add tests for ``Selector`` provider.
+- Add tests for ``ProvidedInstance`` and ``MethodCaller`` providers.
+- Update Makefile to make Python 3 tests to be a default test command: ``make test``.
+
 4.17.0
 ------
 - Add ``FastAPI`` + ``SQLAlchemy`` example.

examples/containers/reset_singletons.py

@@ -0,0 +1,21 @@
+"""Container reset singletons example."""
+
+from dependency_injector import containers, providers
+
+
+class Container(containers.DeclarativeContainer):
+
+    service1 = providers.Singleton(object)
+    service2 = providers.Singleton(object)
+
+
+if __name__ == '__main__':
+    container = Container()
+
+    service1 = container.service1()
+    service2 = container.service2()
+
+    container.reset_singletons()
+
+    assert service1 is not container.service1()
+    assert service2 is not container.service2()

examples/containers/reset_singletons_subcontainers.py

@@ -0,0 +1,26 @@
+"""Container reset singletons in subcontainer example."""
+
+from dependency_injector import containers, providers
+
+
+class SubContainer(containers.DeclarativeContainer):
+
+    service = providers.Singleton(object)
+
+
+class Container(containers.DeclarativeContainer):
+
+    service = providers.Singleton(object)
+    sub = providers.Container(SubContainer)
+
+
+if __name__ == '__main__':
+    container = Container()
+
+    service1 = container.service()
+    service2 = container.sub().service()
+
+    container.reset_singletons()
+
+    assert service1 is not container.service()
+    assert service2 is not container.sub().service()

src/dependency_injector/__init__.py

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

src/dependency_injector/containers.c

@@ -43,6 +43,8 @@ class Container:
     def unwire(self) -> None: ...
     def init_resources(self) -> Optional[Awaitable]: ...
     def shutdown_resources(self) -> Optional[Awaitable]: ...
+    def apply_container_providers_overridings(self) -> None: ...
+    def reset_singletons(self) -> None: ...
     @overload
     def traverse(self, types: Optional[Sequence[Type]] = None) -> Iterator[Provider]: ...
     @classmethod

src/dependency_injector/containers.pyi

@@ -268,11 +268,14 @@ class DynamicContainer(Container):
 
     def apply_container_providers_overridings(self):
         """Apply container providers' overridings."""
-        for provider in self.providers.values():
-            if not isinstance(provider, providers.Container):
-                continue
+        for provider in self.traverse(types=[providers.Container]):
             provider.apply_overridings()
 
+    def reset_singletons(self):
+        """Reset all container singletons."""
+        for provider in self.traverse(types=[providers.Singleton]):
+            provider.reset()
+
 
 class DeclarativeContainerMetaClass(type):
     """Declarative inversion of control container meta class."""