.coveragerc

@@ -0,0 +1,7 @@
+[run]
+source = src/dependency_injector
+omit = tests/unit
+plugins = Cython.Coverage
+
+[html]
+directory=reports/unittests/

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: rmk135

.github/workflows/publishing.yml

@@ -1,7 +1,6 @@
 name: Publishing
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - '*'
@@ -10,28 +9,28 @@ jobs:
 
   tests:
     name: Run tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          python-version: 3.13
+          python-version: 3.9
       - run: pip install tox
       - run: tox
         env:
-          TOXENV: 3.13
+          TOXENV: 3.9
 
   linters:
     name: Run linters
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         toxenv: [flake8, pydocstyle, mypy, pylint]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          python-version: 3.13
+          python-version: 3.9
       - run: pip install tox
       - run: tox
         env:
@@ -40,18 +39,15 @@ jobs:
   build-sdist:
     name: Build source tarball
     needs: [tests, linters]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          python-version: 3.13
-      - run: |
-          python -m pip install --upgrade build
-          python -m build --sdist
-      - uses: actions/upload-artifact@v4
+          python-version: 3.9
+      - run: python setup.py sdist
+      - uses: actions/upload-artifact@v2
         with:
-          name: cibw-sdist
           path: ./dist/*
 
   build-wheels:
@@ -60,47 +56,62 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-14]
+        os: [ubuntu-18.04, windows-latest, macos-latest]
     env:
-      CIBW_SKIP: cp27-*
+      CIBW_SKIP: cp27-win*
     steps:
-      - uses: actions/checkout@v3
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
-      - uses: actions/upload-artifact@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - run: pip install cibuildwheel==1.8.0
+      - run: cibuildwheel --output-dir wheelhouse
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./wheelhouse/*.whl
+
+  build-wheels-linux-aarch64:
+    name: Build wheels (ubuntu-latest-aarch64)
+    needs: [tests, linters]
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - run: pip install cibuildwheel==1.8.0
+      - run: cibuildwheel --archs aarch64 --output-dir wheelhouse
+      - uses: actions/upload-artifact@v2
         with:
-          name: cibw-wheels-x86-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   publish:
     name: Publish on PyPI
-    needs: [build-sdist, build-wheels]
-    runs-on: ubuntu-24.04
+    needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
+    runs-on: ubuntu-18.04
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v2
         with:
-          pattern: cibw-*
+          name: artifact
           path: dist
-          merge-multiple: true
-      - uses: pypa/gh-action-pypi-publish@release/v1
+      - uses: pypa/gh-action-pypi-publish@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-#           For publishing to Test PyPI, uncomment next two lines:
-#          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-#          repository_url: https://test.pypi.org/legacy/
 
   publish-docs:
     name: Publish docs
     needs: [publish]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          python-version: 3.13
-      - run: pip install awscli
+          python-version: 3.9
       - run: pip install -r requirements-doc.txt
+      - run: pip install awscli
       - run: pip install -e .
       - run: (cd docs && make clean html)
       - run: |

.github/workflows/tests-and-linters.yml

@@ -4,31 +4,15 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
 
-  tests-on-legacy-versions:
-    name: Run tests on legacy versions
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [3.7]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - run: pip install tox
-      - run: tox
-        env:
-          TOXENV: ${{ matrix.python-version }}
-
   test-on-different-versions:
     name: Run tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13]
+        python-version: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - run: pip install tox
@@ -36,32 +20,21 @@ jobs:
         env:
           TOXENV: ${{ matrix.python-version }}
 
-  test-different-pydantic-versions:
-    name: Run tests with different pydantic versions
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.12"
-      - run: pip install tox
-      - run: tox -e pydantic-v1,pydantic-v2
-
   test-coverage:
     name: Run tests with coverage
     runs-on: ubuntu-latest
     env:
       DEPENDENCY_INJECTOR_DEBUG_MODE: 1
-      PIP_VERBOSE: 1
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          python-version: 3.12
-      - run: pip install tox 'cython>=3,<4'
-      - run: tox -vv
+          python-version: 3.9
+      - run: pip install tox cython
+      - run: make cythonize
+      - run: tox
         env:
           TOXENV: coveralls
 
@@ -72,10 +45,10 @@ jobs:
       matrix:
         toxenv: [flake8, pydocstyle, mypy, pylint]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          python-version: 3.13
+          python-version: 3.9
       - run: pip install tox
       - run: tox
         env:

.gitignore

@@ -36,7 +36,6 @@ reports/
 .cache
 nosetests.xml
 coverage.xml
-.hypothesis/
 
 # Translations
 *.mo
@@ -55,7 +54,7 @@ target/
 .idea/
 
 # Virtualenv
-venv*/
+venv/
 
 # SQLite
 *.db
@@ -63,13 +62,13 @@ venv*/
 # Vim Rope
 .ropeproject/
 
-# Cython artifacts
-src/**/*.c
-src/**/*.h
-src/**/*.so
-src/**/*.html
+# C extensions
+src/dependency_injector/*.h
+src/dependency_injector/*.so
+src/dependency_injector/containers/*.h
+src/dependency_injector/containers/*.so
+src/dependency_injector/providers/*.h
+src/dependency_injector/providers/*.so
 
 # Workspace for samples
 .workspace/
-
-.vscode/

.pylintrc

@@ -0,0 +1,49 @@
+[MASTER]
+
+# Add <file or directory> to the black list. It should be a base name, not a
+# path. You may set this option multiple times.
+ignore=utils,tests
+
+[MESSAGES CONTROL]
+
+# Disable the message(s) with the given id(s).
+# disable-msg=
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=5
+
+[TYPECHECK]
+ignore-mixin-members=yes
+# ignored-classes=
+zope=no
+# generated-members=providedBy,implementedBy,rawDataReceived
+
+[DESIGN]
+# Maximum number of arguments for function / method
+max-args=10
+
+# Maximum number of locals for function / method body
+max-locals=20
+
+# Maximum number of return / yield for function / method body
+max-returns=10
+
+# Maximum number of branch for function / method body
+max-branchs=10
+
+# Maximum number of statements in function / method body
+max-statements=60
+
+# Maximum number of parents for a class (see R0901).
+max-parents=10
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=30
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=0
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=30

CONTRIBUTORS.rst

@@ -17,8 +17,3 @@ Dependency Injector Contributors
 + Fotis Koutoupas (kootoopas)
 + Shubhendra Singh Chauhan (withshubh)
 + sonthonaxrk (sonthonaxrk)
-+ Ngo Thanh Loi (Leonn) (loingo95)
-+ Thiago Hiromi (thiromi)
-+ Felipe Rubio (krouw)
-+ Anton Petrov (anton-petrov)
-+ ZipFile (ZipFile)

LICENSE.rst

@@ -1,4 +1,4 @@
-Copyright (c) 2024, Roman Mogylatov
+Copyright (c) 2021, ETS Labs
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,6 +1,14 @@
 VERSION := $(shell python setup.py --version)
 
-export COVERAGE_RCFILE := pyproject.toml
+CYTHON_SRC := $(shell find src/dependency_injector -name '*.pyx')
+
+CYTHON_DIRECTIVES = -Xlanguage_level=2
+
+ifdef DEPENDENCY_INJECTOR_DEBUG_MODE
+	CYTHON_DIRECTIVES += -Xprofile=True
+	CYTHON_DIRECTIVES += -Xlinetrace=True
+endif
+
 
 clean:
 	# Clean sources
@@ -17,28 +25,39 @@ clean:
 	find examples -name '*.py[co]' -delete
 	find examples -name '__pycache__' -delete
 
-build: clean
-	# Compile C extensions
-	python setup.py build_ext --inplace
+cythonize:
+	# Compile Cython to C
+	cython -a $(CYTHON_DIRECTIVES) $(CYTHON_SRC)
 	# Move all Cython html reports
 	mkdir -p reports/cython/
 	find src -name '*.html' -exec mv {}  reports/cython/  \;
 
+build: clean cythonize
+	# Compile C extensions
+	python setup.py build_ext --inplace
+
 docs-live:
 	sphinx-autobuild docs docs/_build/html
 
-install: uninstall clean build
+install: uninstall clean cythonize
 	pip install -ve .
 
 uninstall:
 	- pip uninstall -y -q dependency-injector 2> /dev/null
 
-test:
+test-py2: build
 	# Unit tests with coverage report
 	coverage erase
-	coverage run -m pytest -c tests/.configs/pytest.ini
-	coverage report
-	coverage html
+	coverage run --rcfile=./.coveragerc -m unittest discover -s tests/unit/ -p test_*_py2_py3.py
+	coverage report --rcfile=./.coveragerc
+	coverage html --rcfile=./.coveragerc
+
+test: build
+	# Unit tests with coverage report
+	coverage erase
+	coverage run --rcfile=./.coveragerc -m unittest discover -s tests/unit/ -p test_*py3*.py
+	coverage report --rcfile=./.coveragerc
+	coverage html --rcfile=./.coveragerc
 
 check:
 	flake8 src/dependency_injector/
@@ -49,9 +68,9 @@ check:
 
 	mypy tests/typing
 
-test-publish: build
+test-publish: cythonize
 	# Create distributions
-	python -m build --sdist
+	python setup.py sdist
 	# Upload distributions to PyPI
 	twine upload --repository testpypi dist/dependency-injector-$(VERSION)*
 

README.rst

@@ -35,7 +35,7 @@
    :target: https://pypi.org/project/dependency-injector/
    :alt: Wheel
 
-.. image:: https://img.shields.io/github/actions/workflow/status/ets-labs/python-dependency-injector/tests-and-linters.yml?branch=master
+.. image:: https://img.shields.io/github/workflow/status/ets-labs/python-dependency-injector/Tests%20and%20linters/master
    :target: https://github.com/ets-labs/python-dependency-injector/actions
    :alt: Build Status
 
@@ -48,26 +48,26 @@ What is ``Dependency Injector``?
 
 ``Dependency Injector`` is a dependency injection framework for Python.
 
-It helps implement the dependency injection principle.
+It helps implementing the dependency injection principle.
 
 Key features of the ``Dependency Injector``:
 
 - **Providers**. Provides ``Factory``, ``Singleton``, ``Callable``, ``Coroutine``, ``Object``,
-  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency``, and ``Selector`` providers
-  that help assemble your objects.
+  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency`` and ``Selector`` providers
+  that help assembling your objects.
   See `Providers <https://python-dependency-injector.ets-labs.org/providers/index.html>`_.
 - **Overriding**. Can override any provider by another provider on the fly. This helps in testing
-  and configuring dev/stage environment to replace API clients with stubs etc. See
+  and configuring dev / stage environment to replace API clients with stubs etc. See
   `Provider overriding <https://python-dependency-injector.ets-labs.org/providers/overriding.html>`_.
-- **Configuration**. Reads configuration from ``yaml``, ``ini``, and ``json`` files, ``pydantic`` settings,
+- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, ``pydantic`` settings,
   environment variables, and dictionaries.
   See `Configuration provider <https://python-dependency-injector.ets-labs.org/providers/configuration.html>`_.
+- **Containers**. Provides declarative and dynamic containers.
+  See `Containers <https://python-dependency-injector.ets-labs.org/containers/index.html>`_.
 - **Resources**. Helps with initialization and configuring of logging, event loop, thread
   or process pool, etc. Can be used for per-function execution scope in tandem with wiring.
   See `Resource provider <https://python-dependency-injector.ets-labs.org/providers/resource.html>`_.
-- **Containers**. Provides declarative and dynamic containers.
-  See `Containers <https://python-dependency-injector.ets-labs.org/containers/index.html>`_.
-- **Wiring**. Injects dependencies into functions and methods. Helps integrate with
+- **Wiring**. Injects dependencies into functions and methods. Helps integrating with
   other frameworks: Django, Flask, Aiohttp, Sanic, FastAPI, etc.
   See `Wiring <https://python-dependency-injector.ets-labs.org/wiring.html>`_.
 - **Asynchronous**. Supports asynchronous injections.
@@ -75,12 +75,12 @@ Key features of the ``Dependency Injector``:
 - **Typing**. Provides typing stubs, ``mypy``-friendly.
   See `Typing and mypy <https://python-dependency-injector.ets-labs.org/providers/typing_mypy.html>`_.
 - **Performance**. Fast. Written in ``Cython``.
-- **Maturity**. Mature and production-ready. Well-tested, documented, and supported.
+- **Maturity**. Mature and production-ready. Well-tested, documented and supported.
 
 .. code-block:: python
 
    from dependency_injector import containers, providers
-   from dependency_injector.wiring import Provide, inject
+   from dependency_injector.wiring import inject, Provide
 
 
    class Container(containers.DeclarativeContainer):
@@ -90,7 +90,7 @@ Key features of the ``Dependency Injector``:
        api_client = providers.Singleton(
            ApiClient,
            api_key=config.api_key,
-           timeout=config.timeout,
+           timeout=config.timeout.as_int(),
        )
 
        service = providers.Factory(
@@ -100,33 +100,34 @@ Key features of the ``Dependency Injector``:
 
 
    @inject
-   def main(service: Service = Provide[Container.service]) -> None:
+   def main(service: Service = Provide[Container.service]):
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
-       container.config.api_key.from_env("API_KEY", required=True)
-       container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
-       container.wire(modules=[__name__])
+       container.config.api_key.from_env('API_KEY')
+       container.config.timeout.from_env('TIMEOUT')
+       container.wire(modules=[sys.modules[__name__]])
 
        main()  # <-- dependency is injected automatically
 
        with container.api_client.override(mock.Mock()):
            main()  # <-- overridden dependency is injected automatically
 
-When you call the ``main()`` function the ``Service`` dependency is assembled and injected automatically.
+When you call ``main()`` function the ``Service`` dependency is assembled and injected automatically.
 
-When you do testing, you call the ``container.api_client.override()`` method to replace the real API
-client with a mock. When you call ``main()``, the mock is injected.
+When doing a testing you call the ``container.api_client.override()`` to replace the real API
+client with a mock. When you call ``main()`` the mock is injected.
 
 You can override any provider with another provider.
 
-It also helps you in a re-configuring project for different environments: replace an API client
+It also helps you in configuring project for the different environments: replace an API client
 with a stub on the dev or stage.
 
-With the ``Dependency Injector``, object assembling is consolidated in a container. Dependency injections are defined explicitly.
-This makes it easier to understand and change how an application works.
+With the ``Dependency Injector`` objects assembling is consolidated in the container.
+Dependency injections are defined explicitly.
+This makes easier to understand and change how application works.
 
 .. figure:: https://raw.githubusercontent.com/wiki/ets-labs/python-dependency-injector/img/di-readme.svg
    :target: https://github.com/ets-labs/python-dependency-injector
@@ -184,19 +185,19 @@ The framework stands on the `PEP20 (The Zen of Python) <https://www.python.org/d
 
 You need to specify how to assemble and where to inject the dependencies explicitly.
 
-The power of the framework is in its simplicity.
+The power of the framework is in a simplicity.
 ``Dependency Injector`` is a simple tool for the powerful concept.
 
 Frequently asked questions
 --------------------------
 
-What is dependency injection?
+What is the dependency injection?
  - dependency injection is a principle that decreases coupling and increases cohesion
 
 Why should I do the dependency injection?
- - your code becomes more flexible, testable, and clear 😎
+ - your code becomes more flexible, testable and clear 😎
 
-How do I start applying the dependency injection?
+How do I start doing the dependency injection?
  - you start writing the code following the dependency injection principle
  - you register all of your application components and their dependencies in the container
  - when you need a component, you specify where to inject it or get it from the container
@@ -204,7 +205,7 @@ How do I start applying the dependency injection?
 What price do I pay and what do I get?
  - you need to explicitly specify the dependencies
  - it will be extra work in the beginning
- - it will payoff as project grows
+ - it will payoff as the project grows
 
 Have a question?
  - Open a `Github Issue <https://github.com/ets-labs/python-dependency-injector/issues>`_

docs/_static/custom.css

@@ -1,9 +0,0 @@
-.no-border {
-    border: 0 !important;
-    box-shadow: none !important;
-    -webkit-box-shadow: none !important;
-}
-.no-border td {
-    border: 0px !important;
-    padding: 0px 10px 0px 0px !important;
-}

docs/_static/disqus.js

@@ -0,0 +1,11 @@
+var disqus_shortname;
+var disqus_identifier;
+
+$(function() {
+    var disqus_thread = $("#disqus_thread");
+    disqus_shortname = disqus_thread.data('disqus-shortname');
+    disqus_identifier = disqus_thread.data('disqus-identifier');
+    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+});

docs/_static/sponsor.html

@@ -1 +0,0 @@
-<iframe src="https://github.com/sponsors/rmk135/button" title="Sponsor Dependency Injector" height="32" width="114" style="border: 0; border-radius: 6px;"></iframe>

docs/conf.py

@@ -20,49 +20,49 @@ import alabaster
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath(".."))
+sys.path.insert(0, os.path.abspath('..'))
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = "1.0"
+#needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named "sphinx.ext.*") or your custom
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    "alabaster",
-    "sphinx.ext.autodoc",
-    "sphinx_disqus.disqus",
+    'alabaster',
+    'sphinx.ext.autodoc',
+    'sphinxcontrib.disqus',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
-# source_suffix = [".rst", ".md"]
-source_suffix = ".rst"
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = "utf-8-sig"
+#source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = "index"
+master_doc = 'index'
 
 # General information about the project.
-project = "Dependency Injector"
-copyright = "2024, Roman Mogylatov"
-author = "Roman Mogylatov"
+project = u'Dependency Injector'
+copyright = u'2021, ETS Labs'
+author = u'ETS Labs'
 
-# The version info for the project you"re documenting, acts as replacement for
+# The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
 # Getting version:
-with open("../src/dependency_injector/__init__.py") as init_file:
-    version = re.search("__version__ = \"(.*?)\"", init_file.read()).group(1)
+with open('../src/dependency_injector/__init__.py') as init_file:
+    version = re.search('__version__ = \'(.*?)\'', init_file.read()).group(1)
 
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -76,19 +76,19 @@ language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ""
+#today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = "%B %d, %Y"
+#today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
+exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
 #default_role = None
 
-# If true, "()" will be appended to :func: etc. cross-reference text.
+# If true, '()' will be appended to :func: etc. cross-reference text.
 #add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
@@ -100,7 +100,7 @@ exclude_patterns = ["_build"]
 #show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
+pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
@@ -116,8 +116,8 @@ todo_include_todos = False
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-# html_theme = "sphinx_rtd_theme"
-html_theme = "alabaster"
+# html_theme = 'sphinx_rtd_theme'
+html_theme = 'alabaster'
 
 # 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
@@ -141,24 +141,21 @@ html_theme_path = [alabaster.get_path()]
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "favicon.ico"
+html_favicon = 'favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
-html_css_files = [
-    "custom.css",
-]
+html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
 #html_extra_path = []
 
-# If not "", a "Last updated on:" timestamp is inserted at every page bottom,
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = "%b %d, %Y"
+#html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -192,50 +189,50 @@ html_css_files = [
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ""
+#html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 #html_file_suffix = None
 
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
-#   "da", "de", "en", "es", "fi", "fr", "hu", "it", "ja"
-#   "nl", "no", "pt", "ro", "ru", "sv", "tr"
-#html_search_language = "en"
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
 
 # A dictionary with options for the search language support, empty by default.
-# Now only "ja" uses this config value
-#html_search_options = {"type": "default"}
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
 
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = "scorer.js"
+#html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "dependency_injectordoc"
+htmlhelp_basename = 'dependency_injectordoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ("letterpaper" or "a4paper").
-#"papersize": "letterpaper",
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
 
-# The font size ("10pt", "11pt" or "12pt").
-#"pointsize": "10pt",
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
 
 # Additional stuff for the LaTeX preamble.
-#"preamble": "",
+#'preamble': '',
 
 # Latex figure (float) alignment
-#"figure_align": "htbp",
+#'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, "dependency_injector.tex", u"Dependency Injector Documentation",
-   u"Roman Mogylatov", "manual"),
+  (master_doc, 'dependency_injector.tex', u'Dependency Injector Documentation',
+   u'ETS Labs', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -264,7 +261,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, "Dependency Injector", u"Dependency Injector Documentation",
+    (master_doc, 'Dependency Injector', u'Dependency Injector Documentation',
      [author], 1)
 ]
 
@@ -278,9 +275,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, "Dependency Injector", u"Dependency Injector Documentation",
-   author, "Dependency Injector", "Dependency injection microframework for Python",
-   "Miscellaneous"),
+  (master_doc, 'Dependency Injector', u'Dependency Injector Documentation',
+   author, 'Dependency Injector', 'Dependency injection microframework for Python',
+   'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -289,25 +286,24 @@ texinfo_documents = [
 # If false, no module index is generated.
 #texinfo_domain_indices = True
 
-# How to display URL addresses: "footnote", "no", or "inline".
-#texinfo_show_urls = "footnote"
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
 
-# If true, do not generate a @detailmenu in the "Top" node"s menu.
+# If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
-autodoc_member_order = "bysource"
+autodoc_member_order = 'bysource'
 
-disqus_shortname = "python-dependency-injector"
+disqus_shortname = 'python-dependency-injector'
 
 html_theme_options = {
-    "github_user": "ets-labs",
-    "github_repo": "python-dependency-injector",
-    "github_type": "star",
-    "github_button": True,
-    "github_banner": True,
-    "logo": "logo.svg",
-    "description": "Dependency injection framework for Python by Roman Mogylatov",
-    "code_font_size": "10pt",
-    "analytics_id": "UA-67012059-1",
-    "donate_url": "https://github.com/sponsors/rmk135",
+    'github_user': 'ets-labs',
+    'github_repo': 'python-dependency-injector',
+    'github_type': 'star',
+    'github_button': True,
+    'github_banner': True,
+    'logo': 'logo.svg',
+    'description': 'Dependency injection framework for Python',
+    'code_font_size': '10pt',
+    'analytics_id': 'UA-67012059-1',
 }

docs/containers/declarative.rst

@@ -34,39 +34,10 @@ Injections in the declarative container are done the usual way:
    :language: python
    :lines: 3-
 
-You can override container providers while creating a container instance:
+You can override the container providers when you create the container instance:
 
 .. literalinclude:: ../../examples/containers/declarative_override_providers.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 13
-
-Alternatively, you can call ``container.override_providers()`` method when the container instance
-already exists:
-
-.. code-block:: python
-   :emphasize-lines: 3
-
-   container = Container()
-
-   container.override_providers(foo=mock.Mock(Foo), bar=mock.Mock(Bar))
-
-   assert isinstance(container.foo(), mock.Mock)
-   assert isinstance(container.bar(), mock.Mock)
-
-You can also use ``container.override_providers()`` with a context manager to reset
-provided overriding after the context is closed:
-
-.. code-block:: python
-   :emphasize-lines: 3
-
-   container = Container()
-
-   with container.override_providers(foo=mock.Mock(Foo), bar=mock.Mock(Bar)):
-       assert isinstance(container.foo(), mock.Mock)
-       assert isinstance(container.bar(), mock.Mock)
-
-   assert isinstance(container.foo(), Foo)
-   assert isinstance(container.bar(), Bar)
 
 .. disqus::

docs/examples-other/chained-factories.rst

@@ -19,7 +19,7 @@ additional arguments.
    )
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        instance = concrete_factory()
        # Same as: # instance = SomeClass(base_argument=1, extra_argument=2)
 
@@ -43,21 +43,21 @@ Passing of the arguments works the same way like for any other :ref:`factory-pro
        providers.Factory(dict, arg1=1),
        arg2=2,
    )
-   print(chained_dict_factory())  # prints: {"arg1": 1, "arg2": 2}
+   print(chained_dict_factory())  # prints: {'arg1': 1, 'arg2': 2}
 
    # 2. Keyword arguments of upper level factory have priority
    chained_dict_factory = providers.Factory(
        providers.Factory(dict, arg1=1),
        arg1=2,
    )
-   print(chained_dict_factory())  # prints: {"arg1": 2}
+   print(chained_dict_factory())  # prints: {'arg1': 2}
 
    # 3. Keyword arguments provided from context have the most priority
    chained_dict_factory = providers.Factory(
        providers.Factory(dict, arg1=1),
        arg1=2,
    )
-   print(chained_dict_factory(arg1=3))  # prints: {"arg1": 3}
+   print(chained_dict_factory(arg1=3))  # prints: {'arg1': 3}
 
 
 Credits

docs/examples-other/factory-of-factories.rst

@@ -20,7 +20,7 @@ additional arguments.
    )
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        instance = concrete_factory()
        # Same as: # instance = SomeClass(base_argument=1, extra_argument=2)
 
@@ -46,7 +46,7 @@ Passing of the arguments works the same way like for any other :ref:`factory-pro
        arg1=1,
    )
    dict_factory = factory_of_dict_factories(arg2=2)
-   print(dict_factory())  # prints: {"arg1": 1, "arg2": 2}
+   print(dict_factory())  # prints: {'arg1': 1, 'arg2': 2}
 
    # 2. Keyword arguments of upper level factory have priority
    factory_of_dict_factories = providers.Factory(
@@ -55,7 +55,7 @@ Passing of the arguments works the same way like for any other :ref:`factory-pro
        arg1=1,
    )
    dict_factory = factory_of_dict_factories(arg1=2)
-   print(dict_factory())  # prints: {"arg1": 2}
+   print(dict_factory())  # prints: {'arg1': 2}
 
    # 3. Keyword arguments provided from context have the most priority
    factory_of_dict_factories = providers.Factory(
@@ -64,7 +64,7 @@ Passing of the arguments works the same way like for any other :ref:`factory-pro
        arg1=1,
    )
    dict_factory = factory_of_dict_factories(arg1=2)
-   print(dict_factory(arg1=3))  # prints: {"arg1": 3}
+   print(dict_factory(arg1=3))  # prints: {'arg1': 3}
 
 Credits
 -------

docs/examples/aiohttp.rst

@@ -78,6 +78,4 @@ Sources
 
 Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/aiohttp>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/application-multiple-containers.rst

@@ -84,6 +84,4 @@ Run the application
 
 You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-multiple-containers>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/application-single-container.rst

@@ -90,6 +90,4 @@ Run the application
 
 You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-single-container>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/boto3.rst

@@ -8,7 +8,7 @@ Boto3 example
    :description: This example demonstrates a usage of Boto3 AWS client and Dependency Injector.
 
 
-This example shows how to use ``Dependency Injector`` with `Boto3 <https://github.com/boto/boto3>`_.
+This example shows how to use ``Dependency Injector`` with `Boto3 <https://www.djangoproject.com/>`_.
 
 The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/boto3-session>`_.
 
@@ -17,6 +17,4 @@ Listing of ``boto3_session_example.py``:
 .. literalinclude:: ../../examples/miniapps/boto3-session/boto3_session_example.py
    :language: python
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/decoupled-packages.rst

@@ -129,6 +129,4 @@ Run the application
 
 You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/decoupled-packages>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/django.rst

@@ -94,6 +94,4 @@ Sources
 
 Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/django>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/fastapi-redis.rst

@@ -95,6 +95,4 @@ See also:
 - Resource provider :ref:`resource-async-initializers`
 - Wiring :ref:`async-injections-wiring`
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/fastapi-sqlalchemy.rst

@@ -116,6 +116,4 @@ Sources
 
 The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi-sqlalchemy>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/fastapi.rst

@@ -76,6 +76,4 @@ Sources
 
 Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/flask-blueprints.rst

@@ -86,6 +86,4 @@ Sources
 
 Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask-blueprints>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/flask.rst

@@ -84,6 +84,4 @@ Sources
 
 Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/examples/sanic.rst

@@ -70,13 +70,11 @@ Tests use :ref:`provider-overriding` feature to replace giphy client with a mock
 
 .. literalinclude:: ../../examples/miniapps/sanic/giphynavigator/tests.py
    :language: python
-   :emphasize-lines: 34,61,75
+   :emphasize-lines: 27,54,68
 
 Sources
 -------
 
 Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/sanic>`_.
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/index.rst

@@ -9,11 +9,11 @@ Dependency Injector --- Dependency injection framework for Python
    :description: Dependency Injector is a dependency injection framework
                  for Python. It helps to maintain you application structure.
                  It was designed to be unified, developer-friendly
-                 tool that helps to implement dependency injection design
-                 pattern in formal, pretty, Pythonic way. Dependency Injector
-                 provides implementations of such popular design patterns
-                 like IoC container, Factory and Singleton. Dependency
-                 Injector providers are implemented as C extension types
+                 tool that helps to implement dependency injection design 
+                 pattern in formal, pretty, Pythonic way. Dependency Injector 
+                 provides implementations of such popular design patterns 
+                 like IoC container, Factory and Singleton. Dependency 
+                 Injector providers are implemented as C extension types 
                  using Cython.
 
 .. _index:
@@ -50,7 +50,7 @@ Dependency Injector --- Dependency injection framework for Python
    :target: https://pypi.org/project/dependency-injector/
    :alt: Wheel
 
-.. image:: https://img.shields.io/github/actions/workflow/status/ets-labs/python-dependency-injector/tests-and-linters.yml?branch=master
+.. image:: https://img.shields.io/github/workflow/status/ets-labs/python-dependency-injector/Tests%20and%20linters/master
    :target: https://github.com/ets-labs/python-dependency-injector/actions
    :alt: Build Status
 
@@ -65,28 +65,28 @@ It helps implementing the dependency injection principle.
 Key features of the ``Dependency Injector``:
 
 - **Providers**. Provides ``Factory``, ``Singleton``, ``Callable``, ``Coroutine``, ``Object``,
-  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency``, and ``Selector`` providers
-  that help assemble your objects. See :ref:`providers`.
+  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency`` and ``Selector`` providers
+  that help assembling your objects. See :ref:`providers`.
 - **Overriding**. Can override any provider by another provider on the fly. This helps in testing
-  and configuring dev/stage environment to replace API clients with stubs etc. See
+  and configuring dev / stage environment to replace API clients with stubs etc. See
   :ref:`provider-overriding`.
-- **Configuration**. Reads configuration from ``yaml``, ``ini``, and ``json`` files, ``pydantic`` settings,
+- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, ``pydantic`` settings,
   environment variables, and dictionaries. See :ref:`configuration-provider`.
 - **Resources**. Helps with initialization and configuring of logging, event loop, thread
   or process pool, etc. Can be used for per-function execution scope in tandem with wiring.
   See :ref:`resource-provider`.
 - **Containers**. Provides declarative and dynamic containers. See :ref:`containers`.
-- **Wiring**. Injects dependencies into functions and methods. Helps integrate with
+- **Wiring**. Injects dependencies into functions and methods. Helps integrating with
   other frameworks: Django, Flask, Aiohttp, Sanic, FastAPI, etc. See :ref:`wiring`.
 - **Asynchronous**. Supports asynchronous injections. See :ref:`async-injections`.
 - **Typing**. Provides typing stubs, ``mypy``-friendly. See :ref:`provider-typing`.
 - **Performance**. Fast. Written in ``Cython``.
-- **Maturity**. Mature and production-ready. Well-tested, documented, and supported.
+- **Maturity**. Mature and production-ready. Well-tested, documented and supported.
 
 .. code-block:: python
 
    from dependency_injector import containers, providers
-   from dependency_injector.wiring import Provide, inject
+   from dependency_injector.wiring import inject, Provide
 
 
    class Container(containers.DeclarativeContainer):
@@ -96,7 +96,7 @@ Key features of the ``Dependency Injector``:
        api_client = providers.Singleton(
            ApiClient,
            api_key=config.api_key,
-           timeout=config.timeout,
+           timeout=config.timeout.as_int(),
        )
 
        service = providers.Factory(
@@ -106,24 +106,24 @@ Key features of the ``Dependency Injector``:
 
 
    @inject
-   def main(service: Service = Provide[Container.service]) -> None:
+   def main(service: Service = Provide[Container.service]):
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
-       container.config.api_key.from_env("API_KEY", required=True)
-       container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
-       container.wire(modules=[__name__])
+       container.config.api_key.from_env('API_KEY')
+       container.config.timeout.from_env('TIMEOUT')
+       container.wire(modules=[sys.modules[__name__]])
 
        main()  # <-- dependency is injected automatically
 
        with container.api_client.override(mock.Mock()):
            main()  # <-- overridden dependency is injected automatically
 
-With the ``Dependency Injector``, object assembling is consolidated in the container.
+With the ``Dependency Injector`` objects assembling is consolidated in the container.
 Dependency injections are defined explicitly.
-This makes it easier to understand and change how the application works.
+This makes easier to understand and change how application works.
 
 .. figure:: https://raw.githubusercontent.com/wiki/ets-labs/python-dependency-injector/img/di-readme.svg
    :target: https://github.com/ets-labs/python-dependency-injector

docs/introduction/di_in_python.rst

@@ -9,27 +9,27 @@ Dependency injection and inversion of control in Python
                  Dependency Injector, its container, Factory, Singleton and Configuration
                  providers. The example show how to use Dependency Injector providers overriding
                  feature for testing or configuring project in different environments and explains
-                 why it's better than monkey-patching.
+                 why it's better then monkey-patching.
 
-Originally dependency injection pattern got popular in languages with static typing like Java.
-Dependency injection is a principle that helps to achieve an inversion of control. A
-dependency injection framework can significantly improve the flexibility of a language
-with static typing. Implementation of a dependency injection framework for a language
-with static typing is not something that one can do quickly. It will be a quite complex thing
+Originally dependency injection pattern got popular in the languages with a static typing,
+like Java. Dependency injection is a principle that helps to achieve an inversion of control.
+Dependency injection framework can significantly improve a flexibility of the language
+with a static typing. Implementation of a dependency injection framework for a language
+with a static typing is not something that one can do quickly. It will be a quite complex thing
 to be done well. And will take time.
 
-Python is an interpreted language with dynamic typing. There is an opinion that dependency
+Python is an interpreted language with a dynamic typing. There is an opinion that dependency
 injection doesn't work for it as well as it does for Java. A lot of the flexibility is already
-built-in. Also, there is an opinion that a dependency injection framework is something that
+built in. Also there is an opinion that a dependency injection framework is something that
 Python developer rarely needs. Python developers say that dependency injection can be implemented
 easily using language fundamentals.
 
-This page describes the advantages of applying dependency injection in Python. It
-contains Python examples that show how to implement dependency injection. It demonstrates the usage
-of the ``Dependency Injector`` framework, its container, ``Factory``, ``Singleton``,
-and ``Configuration`` providers. The example shows how to use providers' overriding feature
-of ``Dependency Injector`` for testing or re-configuring a project in different environments and
-explains why it's better than monkey-patching.
+This page describes the advantages of the dependency injection usage in Python. It
+contains Python examples that show how to implement dependency injection. It demonstrates a usage
+of the dependency injection framework ``Dependency Injector``, its container, ``Factory``,
+``Singleton`` and ``Configuration`` providers. The example shows how to use ``Dependency Injector``
+providers overriding feature for testing or configuring project in different environments and
+explains why it's better then monkey-patching.
 
 What is dependency injection?
 -----------------------------
@@ -44,14 +44,14 @@ What is coupling and cohesion?
 
 Coupling and cohesion are about how tough the components are tied.
 
-- **High coupling**. If the coupling is high it's like using superglue or welding. No easy way
+- **High coupling**. If the coupling is high it's like using a superglue or welding. No easy way
   to disassemble.
-- **High cohesion**. High cohesion is like using screws. Quite easy to disassemble and
-  re-assemble in a different way. It is an opposite to high coupling.
+- **High cohesion**. High cohesion is like using the screws. Very easy to disassemble and
+  assemble back or assemble a different way. It is an opposite to high coupling.
 
-Cohesion often correlates with coupling. Higher cohesion usually leads to lower coupling and vice versa.
+When the cohesion is high the coupling is low.
 
-Low coupling brings flexibility. Your code becomes easier to change and test.
+Low coupling brings a flexibility. Your code becomes easier to change and test.
 
 How to implement the dependency injection?
 
@@ -66,14 +66,14 @@ Before:
 
    class ApiClient:
 
-       def __init__(self) -> None:
-           self.api_key = os.getenv("API_KEY")  # <-- dependency
-           self.timeout = int(os.getenv("TIMEOUT"))  # <-- dependency
+       def __init__(self):
+           self.api_key = os.getenv('API_KEY')  # <-- dependency
+           self.timeout = os.getenv('TIMEOUT')  # <-- dependency
 
 
    class Service:
 
-       def __init__(self) -> None:
+       def __init__(self):
            self.api_client = ApiClient()  # <-- dependency
 
 
@@ -82,7 +82,7 @@ Before:
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        main()
 
 After:
@@ -94,27 +94,27 @@ After:
 
    class ApiClient:
 
-       def __init__(self, api_key: str, timeout: int) -> None:
+       def __init__(self, api_key: str, timeout: int):
            self.api_key = api_key  # <-- dependency is injected
            self.timeout = timeout  # <-- dependency is injected
 
 
    class Service:
 
-       def __init__(self, api_client: ApiClient) -> None:
+       def __init__(self, api_client: ApiClient):
            self.api_client = api_client  # <-- dependency is injected
 
 
-   def main(service: Service) -> None:  # <-- dependency is injected
+   def main(service: Service):  # <-- dependency is injected
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        main(
            service=Service(
                api_client=ApiClient(
-                   api_key=os.getenv("API_KEY"),
-                   timeout=int(os.getenv("TIMEOUT")),
+                   api_key=os.getenv('API_KEY'),
+                   timeout=os.getenv('TIMEOUT'),
                ),
            ),
        )
@@ -136,8 +136,8 @@ Now you need to assemble and inject the objects like this:
    main(
        service=Service(
            api_client=ApiClient(
-               api_key=os.getenv("API_KEY"),
-               timeout=int(os.getenv("TIMEOUT")),
+               api_key=os.getenv('API_KEY'),
+               timeout=os.getenv('TIMEOUT'),
            ),
        ),
    )
@@ -149,20 +149,20 @@ Here comes the ``Dependency Injector``.
 What does the Dependency Injector do?
 -------------------------------------
 
-With the dependency injection pattern, objects lose the responsibility of assembling
-the dependencies. The ``Dependency Injector`` absorbs that responsibility.
+With the dependency injection pattern objects loose the responsibility of assembling
+the dependencies. The ``Dependency Injector`` absorbs that responsibilities.
 
 ``Dependency Injector`` helps to assemble and inject the dependencies.
 
 It provides a container and providers that help you with the objects assembly.
 When you need an object you place a ``Provide`` marker as a default value of a
-function argument. When you call this function, framework assembles and injects
+function argument. When you call this function framework assembles and injects
 the dependency.
 
 .. code-block:: python
 
    from dependency_injector import containers, providers
-   from dependency_injector.wiring import Provide, inject
+   from dependency_injector.wiring import inject, Provide
 
 
    class Container(containers.DeclarativeContainer):
@@ -172,7 +172,7 @@ the dependency.
        api_client = providers.Singleton(
            ApiClient,
            api_key=config.api_key,
-           timeout=config.timeout,
+           timeout=config.timeout.as_int(),
        )
 
        service = providers.Factory(
@@ -182,94 +182,94 @@ the dependency.
 
 
    @inject
-   def main(service: Service = Provide[Container.service]) -> None:
+   def main(service: Service = Provide[Container.service]):
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
-       container.config.api_key.from_env("API_KEY", required=True)
-       container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
-       container.wire(modules=[__name__])
+       container.config.api_key.from_env('API_KEY')
+       container.config.timeout.from_env('TIMEOUT')
+       container.wire(modules=[sys.modules[__name__]])
 
        main()  # <-- dependency is injected automatically
 
        with container.api_client.override(mock.Mock()):
            main()  # <-- overridden dependency is injected automatically
 
-When you call the ``main()`` function the ``Service`` dependency is assembled and injected automatically.
+When you call ``main()`` function the ``Service`` dependency is assembled and injected automatically.
 
-When you do testing, you call the ``container.api_client.override()`` method to replace the real API
-client with a mock. When you call ``main()``, the mock is injected.
+When doing a testing you call the ``container.api_client.override()`` to replace the real API
+client with a mock. When you call ``main()`` the mock is injected.
 
 You can override any provider with another provider.
 
-It also helps you in a re-configuring project for different environments: replace an API client
+It also helps you in configuring project for the different environments: replace an API client
 with a stub on the dev or stage.
 
-Objects assembling is consolidated in a container. Dependency injections are defined explicitly.
-This makes it easier to understand and change how an application works.
+Objects assembling is consolidated in the container. Dependency injections are defined explicitly.
+This makes easier to understand and change how application works.
 
 Testing, Monkey-patching and dependency injection
 -------------------------------------------------
 
-The testability benefit is opposed to monkey-patching.
+The testability benefit is opposed to a monkey-patching.
 
-In Python, you can monkey-patch anything, anytime. The problem with monkey-patching is
-that it's too fragile. The cause of it is that when you monkey-patch you do something that
-wasn't intended to be done. You monkey-patch the implementation details. When implementation
-changes the monkey-patching is broken.
+In Python you can monkey-patch
+anything, anytime. The problem with a monkey-patching is that it's too fragile. The reason is that
+when you monkey-patch you do something that wasn't intended to be done. You monkey-patch the
+implementation details. When implementation changes the monkey-patching is broken.
 
-With dependency injection, you patch the interface, not an implementation. This is a way more
+With a dependency injection you patch the interface, not an implementation. This is a way more
 stable approach.
 
-Also, monkey-patching is way too dirty to be used outside of the testing code for
-re-configuring the project for the different environments.
+Also monkey-patching is a way too dirty to be used outside of the testing code for
+reconfiguring the project for the different environments.
 
 Conclusion
 ----------
 
-Dependency injection provides you with three advantages:
+Dependency injection brings you 3 advantages:
 
-- **Flexibility**. The components are loosely coupled. You can easily extend or change the
-  functionality of a system by combining the components in a different way. You even can do it on
+- **Flexibility**. The components are loosely coupled. You can easily extend or change a
+  functionality of the system by combining the components different way. You even can do it on
   the fly.
-- **Testability**. Testing is easier because you can easily inject mocks instead of real objects
+- **Testability**. Testing is easy because you can easily inject mocks instead of real objects
   that use API or database, etc.
 - **Clearness and maintainability**. Dependency injection helps you reveal the dependencies.
   Implicit becomes explicit. And "Explicit is better than implicit" (PEP 20 - The Zen of Python).
-  You have all the components and dependencies defined explicitly in a container. This
-  provides an overview and control of the application structure. It is easier to understand and
+  You have all the components and dependencies defined explicitly in the container. This
+  provides an overview and control on the application structure. It is easy to understand and
   change it.
 
-Is it worth applying dependency injection in Python?
+Is it worth to use a dependency injection in Python?
 
 It depends on what you build. The advantages above are not too important if you use Python as a
 scripting language. The picture is different when you use Python to create an application. The
-larger the application the more significant the benefits.
+larger the application the more significant is the benefit.
 
-Is it worth using a framework for applying dependency injection?
+Is it worth to use a framework for the dependency injection?
 
 The complexity of the dependency injection pattern implementation in Python is
-lower than in other languages but it's still in place. It doesn't mean you have to use a
+lower than in the other languages but it's still in place. It doesn't mean you have to use a
 framework but using a framework is beneficial because the framework is:
 
 - Already implemented
 - Tested on all platforms and versions of Python
 - Documented
 - Supported
-- Other engineers are familiar with it
+- Known to the other engineers
 
-An advice at last:
+Few advices at last:
 
 - **Give it a try**. Dependency injection is counter-intuitive. Our nature is that
   when we need something the first thought that comes to our mind is to go and get it. Dependency
-  injection is just like "Wait, I need to state a need instead of getting something right away".
+  injection is just like "Wait, I need to state a need instead of getting something right now".
   It's like a little investment that will pay-off later. The advice is to just give it a try for
   two weeks. This time will be enough for getting your own impression. If you don't like it you
   won't lose too much.
-- **Common sense first**. Use common sense when applying dependency injection. It is a good
-  principle, but not a silver bullet. If you do it too much you will reveal too many of the
+- **Common sense first**. Use a common sense when apply dependency injection. It is a good
+  principle, but not a silver bullet. If you do it too much you will reveal too much of the
   implementation details. Experience comes with practice and time.
 
 What's next?
@@ -303,13 +303,12 @@ Choose one of the following as a next step:
 Useful links
 ------------
 
-A few useful links related to a dependency injection design pattern for further reading:
+There are some useful links related to dependency injection design pattern
+that could be used for further reading:
 
 + https://en.wikipedia.org/wiki/Dependency_injection
 + https://martinfowler.com/articles/injection.html
 + https://github.com/ets-labs/python-dependency-injector
 + https://pypi.org/project/dependency-injector/
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/introduction/index.rst

@@ -7,8 +7,8 @@ Introduction
                  overview of the dependency injection, inversion of
                  control and Dependency Injector framework.
 
-The current section of the documentation provides an overview of the
-dependency injection, inversion of control, and the ``Dependency Injector`` framework.
+Current section of the documentation provides an overview of the
+dependency injection, inversion of control and the ``Dependency Injector`` framework.
 
 ..  toctree::
     :maxdepth: 2

docs/introduction/installation.rst

@@ -2,7 +2,7 @@ Installation
 ============
 
 ``Dependency Injector`` is available on `PyPI <https://pypi.org/project/dependency-injector/>`_.
-To install the latest version you can use ``pip``:
+To install latest version you can use ``pip``:
 
 .. code-block:: bash
 
@@ -10,7 +10,7 @@ To install the latest version you can use ``pip``:
 
 Some modules of the ``Dependency Injector`` are implemented as C extensions.
 ``Dependency Injector`` is distributed as a pre-compiled wheels. Wheels are
-available for all supported Python versions on Linux, Windows, and MacOS.
+available for all supported Python versions on Linux, Windows and MacOS.
 Linux distribution uses `manylinux <https://github.com/pypa/manylinux>`_.
 
 If there is no appropriate wheel for your environment (Python version and OS)
@@ -23,20 +23,20 @@ To verify the installed version:
 
     >>> import dependency_injector
     >>> dependency_injector.__version__
-    '4.39.0'
+    '4.0.0'
 
 .. note::
-   When adding ``Dependency Injector`` to ``pyproject.toml`` or ``requirements.txt``
-   don't forget to pin the version to the current major:
+    When add ``Dependency Injector`` to the ``requirements.txt`` don't forget to pin version
+    to the current major:
 
-   .. code-block:: bash
+    .. code-block:: bash
 
-       dependency-injector>=4.0,<5.0
+        dependency-injector>=4.0,<5.0
 
-   *The next major version can be incompatible.*
+    *Next major version can be incompatible.*
 
-All releases are available on the `PyPI release history page <https://pypi.org/project/dependency-injector/#history>`_.
-Each release has an appropriate tag. The tags are available on the
+All releases are available on `PyPI release history page <https://pypi.org/project/dependency-injector/#history>`_.
+Each release has appropriate tag. The tags are available on
 `GitHub releases page <https://github.com/ets-labs/python-dependency-injector/releases>`_.
 
 .. disqus::

docs/introduction/key_features.rst

@@ -11,23 +11,23 @@ Key features
 Key features of the ``Dependency Injector``:
 
 - **Providers**. Provides ``Factory``, ``Singleton``, ``Callable``, ``Coroutine``, ``Object``,
-  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency``, and ``Selector`` providers
-  that help assemble your objects. See :ref:`providers`.
+  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency`` and ``Selector`` providers
+  that help assembling your objects. See :ref:`providers`.
 - **Overriding**. Can override any provider by another provider on the fly. This helps in testing
-  and configuring dev/stage environment to replace API clients with stubs etc. See
+  and configuring dev / stage environment to replace API clients with stubs etc. See
   :ref:`provider-overriding`.
-- **Configuration**. Reads configuration from ``yaml``, ``ini``, and ``json`` files, ``pydantic`` settings,
+- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, ``pydantic`` settings,
   environment variables, and dictionaries. See :ref:`configuration-provider`.
 - **Resources**. Helps with initialization and configuring of logging, event loop, thread
   or process pool, etc. Can be used for per-function execution scope in tandem with wiring.
   See :ref:`resource-provider`.
 - **Containers**. Provides declarative and dynamic containers. See :ref:`containers`.
-- **Wiring**. Injects dependencies into functions and methods. Helps integrate with
+- **Wiring**. Injects dependencies into functions and methods. Helps integrating with
   other frameworks: Django, Flask, Aiohttp, Sanic, FastAPI, etc. See :ref:`wiring`.
 - **Asynchronous**. Supports asynchronous injections. See :ref:`async-injections`.
 - **Typing**. Provides typing stubs, ``mypy``-friendly. See :ref:`provider-typing`.
 - **Performance**. Fast. Written in ``Cython``.
-- **Maturity**. Mature and production-ready. Well-tested, documented, and supported.
+- **Maturity**. Mature and production-ready. Well-tested, documented and supported.
 
 The framework stands on the `PEP20 (The Zen of Python) <https://www.python.org/dev/peps/pep-0020/>`_ principle:
 
@@ -37,7 +37,7 @@ The framework stands on the `PEP20 (The Zen of Python) <https://www.python.org/d
 
 You need to specify how to assemble and where to inject the dependencies explicitly.
 
-The power of the framework is in its simplicity.
+The power of the framework is in a simplicity.
 ``Dependency Injector`` is a simple tool for the powerful concept.
 
 .. disqus::

docs/main/changelog.rst

@@ -1,270 +1,12 @@
 Changelog
 =========
 
-This document describes all the changes in *Dependency Injector* framework
+This document describes all the changes in *Dependency Injector* framework 
 that were made in every particular version.
 
-From version 0.7.6 *Dependency Injector* framework strictly
+From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
-4.46.0
-------
-
-- Add option to disable env var interpolation in configs (`#861 <https://github.com/ets-labs/python-dependency-injector/pull/861>`_)
-- Fix ``Closing`` dependency resolution (`#852 <https://github.com/ets-labs/python-dependency-injector/pull/852>`_)
-- Add support for ``inspect.iscoroutinefunction()`` in ``Coroutine`` provider (`#830 <https://github.com/ets-labs/python-dependency-injector/pull/830>`_)
-- Fix broken wiring of sync inject-decorated methods (`#673 <https://github.com/ets-labs/python-dependency-injector/pull/673>`_)
-- Add support for ``typing.Annotated`` (`#721 <https://github.com/ets-labs/python-dependency-injector/pull/721>`_, `#853 <https://github.com/ets-labs/python-dependency-injector/pull/853>`_)
-- Documentation updates for movie-lister example (`#747 <https://github.com/ets-labs/python-dependency-injector/pull/747>`_)
-- Fix type propagation in ``Provider.provider`` (`#744 <https://github.com/ets-labs/python-dependency-injector/pull/744>`_)
-
-Many thanks for the contributions to:
-- `ZipFile <https://github.com/ZipFile>`_
-- `Yegor Statkevich <https://github.com/jazzthief>`_
-- `Federico Tomasi <https://github.com/federinik>`_
-- `Martin Lafrance <https://github.com/martlaf>`_
-- `Philip Bjorge <https://github.com/philipbjorge>`_
-- `Ilya Kazakov <https://github.com/mrKazzila>`_
-
-4.45.0
---------
-- Add Starlette lifespan handler implementation (`#683 <https://github.com/ets-labs/python-dependency-injector/pull/683>`_).
-- Raise exception in ``ThreadLocalSingleton`` instead of hiding it in finally (`#845 <https://github.com/ets-labs/python-dependency-injector/pull/845>`_).
-- Improve debuggability of ``deepcopy`` errors (`#839 <https://github.com/ets-labs/python-dependency-injector/pull/839>`_).
-- Update examples (`#838 <https://github.com/ets-labs/python-dependency-injector/pull/838>`_).
-- Upgrade testing dependencies (`#837 <https://github.com/ets-labs/python-dependency-injector/pull/837>`_).
-- Add minor fixes to the documentation (`#709 <https://github.com/ets-labs/python-dependency-injector/pull/709>`_).
-- Remove ``six`` from the dependencies (`3ba4704 <https://github.com/ets-labs/python-dependency-injector/commit/3ba4704bc1cb00310749fd2eda0c8221167c313c>`_).
-
-Many thanks for the contributions to:
--  `ZipFile <https://github.com/ZipFile>`_
-- `František Trebuňa <https://github.com/gortibaldik>`_
-- `JC (Jonathan Chen) <https://github.com/dijonkitchen>`_
-
-4.44.0
---------
-- Implement support for Pydantic 2. PR: `#832 <https://github.com/ets-labs/python-dependency-injector/pull/832>`_.
-- Implement `PEP-517 <https://peps.python.org/pep-0517/>`_, `PEP-518 <https://peps.python.org/pep-0518/>`_, and
-  `PEP-621 <https://peps.python.org/pep-0621/>`_. PR: `#829 <https://github.com/ets-labs/python-dependency-injector/pull/829>`_.
-
-Many thanks to `ZipFile <https://github.com/ZipFile>`_ for both contributions.
-
-4.43.0
---------
-- Add support for Python 3.13.
-- Migrate to Cython 3 (version 3.0.11). Many thanks to `ZipFile <https://github.com/ZipFile>`_ for
-  this contribution `#813 <https://github.com/ets-labs/python-dependency-injector/pull/813>`_.
-
-4.42.0
---------
-- Promote release ``4.42.0b1`` to a production release.
-- Fix the Disqus comment widget.
-
-4.42.0b1
---------
-
-- Add support of Python 3.12.
-- Drop support of Python 2.7, 3.5, and 3.6.
-- Regenerate C sources using Cython 0.29.37.
-- Update ``cibuildwheel`` to version ``2.20.0``.
-
-4.41.0
-------
-- Add support of Python 3.11.
-- Allow Closing to detect dependent resources `#633 <https://github.com/ets-labs/python-dependency-injector/issues/633>`_,
-  `#636 <https://github.com/ets-labs/python-dependency-injector/pull/636>`_. Thanks `Jamie Stumme @StummeJ <https://github.com/StummeJ>`_
-  for the contribution.
-- Update CI/CD to use Ubuntu 22.04.
-- Update CI/CD to ``actions/checkout@v3``, ``actions/setup-python@v4``, ``actions/upload-artifact@v3``, ``pypa/cibuildwheel@v2.11.3``,
-  and ``actions/download-artifact@v3``.
-- Fix install crash on non-utf8 systems `#644 <https://github.com/ets-labs/python-dependency-injector/pull/644>`_.
-- Fix a bug in Windows build with default charset `#635 <https://github.com/ets-labs/python-dependency-injector/pull/635>`_.
-- Update FastAPI Redis example to use ``aioredis`` version 2 `#613 <https://github.com/ets-labs/python-dependency-injector/pull/613>`_.
-- Update documentation on creating custom providers `#598 <https://github.com/ets-labs/python-dependency-injector/pull/598>`_.
-- Regenerate C sources using Cython 0.29.32.
-- Fix builds badge.
-
-4.40.0
-------
-- Add ``Configuration.from_json()`` method to load configuration from a json file.
-- Fix bug with wiring not working properly with functions double wrapped by ``@functools.wraps`` decorator.
-  See issue: `#454 <https://github.com/ets-labs/python-dependency-injector/issues/454>`_.
-  Many thanks to: `@platipo <https://github.com/platipo>`_, `@MatthieuMoreau0 <https://github.com/MatthieuMoreau0>`_,
-  `@fabiocerqueira <https://github.com/fabiocerqueira>`_, `@Jitesh-Khuttan <https://github.com/Jitesh-Khuttan>`_.
-- Refactor wiring module to store all patched callable data in the ``PatchedRegistry``.
-- Improve wording on the "Dependency injection and inversion of control in Python" docs page.
-- Add documentation on the ``@inject`` decorator.
-- Update typing in the main example and cohesion/coupling correlation definition in
-  "Dependency injection and inversion of control in Python".
-  Thanks to `@illia-v (Illia Volochii) <https://github.com/illia-v>`_ for the
-  PR (`#580 <https://github.com/ets-labs/python-dependency-injector/pull/580>`_).
-- Update copyright year.
-- Enable skipped test ``test_schema_with_boto3_session()``.
-- Update pytest configuration.
-- Regenerate C sources using Cython 0.29.30.
-
-4.39.1
-------
-- Fix bug `#574 <https://github.com/ets-labs/python-dependency-injector/issues/574>`_:
-  "``@inject`` breaks ``inspect.iscoroutinefunction``". Thanks to
-  `@burritoatspoton (Rafał Burczyński) <https://github.com/burritoatspoton>`_ for reporting the issue.
-
-4.39.0
-------
-- Optimize injections and wiring from x1.5 to x7 times depending on the use case.
-- Fix bug `#569 <https://github.com/ets-labs/python-dependency-injector/issues/569>`_:
-  "numpy.typing.NDArray breaks wiring". Thanks to
-  `@VKFisher (Vlad Fisher) <https://github.com/VKFisher>`_ for reporting the issue and providing a fix.
-
-4.38.0
-------
-- Add new provider ``Aggregate``. It is a generalized version of ``FactoryAggregate`` that
-  can contain providers of any type, not only ``Factory``. See issue
-  `#530 <https://github.com/ets-labs/python-dependency-injector/issues/530>`_. Thanks to
-  `@zerlok (Danil Troshnev) <https://github.com/zerlok>`_ for suggesting the feature.
-- Add argument ``as_`` to the ``config.from_env()`` method for the explicit type casting
-  of an environment variable value, e.g.: ``config.timeout.from_env("TIMEOUT", as_=int)``.
-  See issue `#533 <https://github.com/ets-labs/python-dependency-injector/issues/533>`_. Thanks to
-  `@gtors (Andrey Torsunov) <https://github.com/gtors>`_ for suggesting the feature.
-- Add ``.providers`` attribute to the ``FactoryAggregate`` provider. It is an alias for
-  ``FactoryAggregate.factories`` attribute.
-- Add ``.set_providers()`` method to the ``FactoryAggregate`` provider. It is an alias for
-  ``FactoryAggregate.set_factories()`` method.
-- Add string imports for ``Factory``, ``Singleton``, ``Callable``, ``Resource``, and ``Coroutine``
-  providers, e.g. ``Factory("module.Class")``.
-  See issue `#531 <https://github.com/ets-labs/python-dependency-injector/issues/531>`_.
-  Thanks to `@al-stefanitsky-mozdor <https://github.com/al-stefanitsky-mozdor>`_ for suggesting the feature.
-- Fix ``Dependency`` provider to don't raise "Dependency is not defined" error when the ``default``
-  is a falsy value of proper type.
-  See issue `#550 <https://github.com/ets-labs/python-dependency-injector/issues/550>`_. Thanks to
-  `@approxit <https://github.com/approxit>`_ for reporting the issue.
-- Refactor ``FactoryAggregate`` provider internals.
-- Update logo on Github and in docs to support dark themes and remove some imperfections.
-
-4.37.0
-------
-- Add support of Python 3.10.
-- Improve wiring with adding importing modules and packages from a string
-  ``container.wire(modules=["yourapp.module1"])``.
-- Add container wiring configuration ``wiring_config = containers.WiringConfiguration()``.
-- Add support of ``with`` statement for ``container.override_providers()`` method.
-- Add ``Configuration(yaml_files=[...])`` argument.
-- Add ``Configuration(ini_files=[...])`` argument.
-- Add ``Configuration(pydantic_settings=[...])`` argument.
-- Drop support of Python 3.4. There are no immediate breaking changes, but Dependency Injector
-  will no longer be tested on Python 3.4 and any bugs will not be fixed.
-- Announce the date of dropping Python 3.5 support (Jan 1st 2022).
-- Fix ``Dependency.is_defined`` attribute to always return boolean value.
-- Fix ``envs_required=False`` behavior in ``Configuration.from_*()`` methods
-  to give a priority to the explicitly provided value.
-- Update documentation and fix typos.
-- Regenerate C sources using Cython 0.29.24.
-- Migrate tests to ``pytest``.
-
-4.36.2
-------
-- Update docs.
-
-4.36.1
-------
-- Fix a wiring bug with improper resolving of ``Provide[some_provider.provider]``.
-- Fix a typo in ``Factory`` provider docs ``service.add_attributes(clent=client)``
-  `#499 <https://github.com/ets-labs/python-dependency-injector/issues/499>`_.
-  Thanks to `@rajanjha786 <https://github.com/rajanjha786>`_ for the contribution.
-- Fix a typo in ``boto3`` example
-  `#511 <https://github.com/ets-labs/python-dependency-injector/issues/511>`_.
-  Thanks to `@whysage <https://github.com/whysage>`_ for the contribution.
-
-4.36.0
-------
-- Add support of non-string keys for ``FactoryAggregate`` provider.
-- Improve ``FactoryAggregate`` typing stub.
-- Improve resource subclasses typing and make shutdown definition optional
-  `PR #492 <https://github.com/ets-labs/python-dependency-injector/pull/492>`_.
-  Thanks to `@EdwardBlair <https://github.com/EdwardBlair>`_  for suggesting the improvement.
-- Fix type annotations for ``.provides``.
-  Thanks to `Thiago Hiromi @thiromi <https://github.com/thiromi>`_ for the fix
-  `PR #491 <https://github.com/ets-labs/python-dependency-injector/pull/491>`_.
-- Fix environment variables interpolation examples in configuration provider docs ``{$ENV} -> ${ENV}``.
-  Thanks to `Felipe Rubio @krouw <https://github.com/krouw>`_ for reporting the issue and
-  fixing yaml example `PR #494 <https://github.com/ets-labs/python-dependency-injector/pull/494>`_.
-- Fix ``@containers.copy()`` decorator to respect dependencies on parent providers.
-  See issue `#477 <https://github.com/ets-labs/python-dependency-injector/issues/477>`_.
-  Thanks to `Andrey Torsunov @gtors <https://github.com/gtors>`_  for reporting the issue.
-- Fix typing stub for ``container.override_providers()`` to accept other types besides ``Provider``.
-- Fix runtime issue with generic typing in resource initializer classes ``resources.Resource``
-  and ``resources.AsyncResource``.
-  See issue `#488 <https://github.com/ets-labs/python-dependency-injector/issues/488>`_.
-  Thanks to `@EdwardBlair <https://github.com/EdwardBlair>`_  for reporting the issue.
-
-4.35.3
-------
-- *This release was removed from PyPI. It was inconsistently published because project has
-  reached a PyPI size limit. Changes from this release are published on PyPI in next version.*
-
-4.35.2
-------
-- Update wiring to support modules provided as packages.
-  See issue `#481 <https://github.com/ets-labs/python-dependency-injector/issues/481>`_.
-  Thanks to `@Sadbot <https://github.com/Sadbot>`_  for demonstrating the issue.
-
-4.35.1
-------
-- Fix a container issue with supporting custom string types.
-  See issue `#479 <https://github.com/ets-labs/python-dependency-injector/issues/479>`_.
-  Thanks to `@ilsurih <https://github.com/ilsurih>`_  for reporting the issue.
-
-4.35.0
-------
-- Add support of six 1.16.0.
-
-4.34.2
-------
-- Fix a bug with reverse shutdown order in ``container.shutdown_resources()``.
-  See issue `#432 <https://github.com/ets-labs/python-dependency-injector/issues/432>`_.
-  Thanks to `Saulius Beinorius <https://github.com/saulbein>`_  for bringing up the issue.
-
-4.34.1
-------
-- Update ``container.shutdown_resources()`` to respect dependencies order while shutdown.
-  See issue `#432 <https://github.com/ets-labs/python-dependency-injector/issues/432>`_.
-  Thanks to `Saulius Beinorius <https://github.com/saulbein>`_  for bringing up the issue.
-
-4.34.0
-------
-- Add option ``envs_required`` for configuration provider ``.from_yaml()`` and ``.from_ini()``
-  methods. With ``envs_required=True`` methods ``.from_yaml()`` and ``.from_ini()`` raise
-  an exception when encounter an undefined environment variable in the configuration file.
-  By default this option is set to false for preserving previous behavior ``envs_required=False``.
-- Add raising of an exception in configuration provider strict mode when provider encounters
-  an undefined environment variable in the configuration file.
-- Update configuration provider environment variables interpolation to replace
-  undefined environment variables with an empty value.
-- Update configuration provider to perform environment variables interpolation before passing
-  configuration file content to the parser.
-
-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.
-  Thanks to `@loingo95 <https://github.com/loingo95>`_ for the fix.
-
-4.32.2
-------
-- Improve wiring fault tolerance.
-  See issue `#441 <https://github.com/ets-labs/python-dependency-injector/issues/441>`_.
-  Thanks to `@ssheng <https://github.com/ssheng>`_ for reporting the issue.
-
 4.32.1
 ------
 - Fix a bug with ``List`` provider not working in async mode.
@@ -1371,24 +1113,24 @@ Misc:
 ------
 - Add ``DependenciesContainer`` provider.
 - Add "use_cases" example miniapp.
-- Update documentation requirements to use fixed version of
+- Update documentation requirements to use fixed version of 
   ``sphinxcontrib-disqus``.
 
 
 3.9.1
 -----
 - Fix docs build problem (``sphinx`` is frozen on ``1.5.6`` version because of
-  incompatibility with ``sphinxcontrib-discus``).
+  incompatibility with ``sphinxcontrib-discus``). 
 - Add badge for docs.
 
 3.9.0
 -----
-- Change initialization of declarative container, so it accepts overriding
-  providers as keyword arguments -
+- Change initialization of declarative container, so it accepts overriding 
+  providers as keyword arguments - 
   ``DeclarativeContainer(**overriding_providers)``.
-- Add method to dynamic catalog for setting groups of providers -
+- Add method to dynamic catalog for setting groups of providers -  
   ``DynamicContainer.set_providers(**providers)``.
-- Add method to dynamic catalog for overriding groups of providers -
+- Add method to dynamic catalog for overriding groups of providers -  
   ``DynamicContainer.set_providers(**overriding_providers)``.
 - Rename ``ExternalDependency`` provider to ``Dependency``.
 - Add default value for ``instance_of`` argument of ``Dependency`` provider -
@@ -1420,7 +1162,7 @@ Misc:
 3.7.0
 -----
 - Add ``FactoryAggregate`` provider.
-- Add ``Provider.provider`` dynamic attribute that return new provider's
+- Add ``Provider.provider`` dynamic attribute that return new provider's 
   delegate (alias of method ``Provider.delegate()``).
 - Add support of six 1.11.0.
 - Regenerate C sources using Cython 0.27.1.
@@ -1437,7 +1179,7 @@ Misc:
 
 3.5.0
 -----
-- Add functionality for initializing ``Configuration`` provider with default
+- Add functionality for initializing ``Configuration`` provider with default 
   values.
 
 3.4.8
@@ -1460,7 +1202,7 @@ Misc:
 
 3.4.4
 -----
-- Add ``Provider.last_overriding`` read-only property that points to last
+- Add ``Provider.last_overriding`` read-only property that points to last 
   overriding provider, if any. If target provider is not overridden, ``None``
   would be returned.
 - Update example of writing custom providers.
@@ -1474,7 +1216,7 @@ Misc:
 3.4.2
 -----
 - Make ``Provider`` overriding methods thread safe:
-  ``Provider.override(provider)``, ``Provider.reset_last_overriding()``,
+  ``Provider.override(provider)``, ``Provider.reset_last_overriding()``, 
   ``Provider.reset_override()``.
 - Refactor storage locking of ``ThreadSafeSingleton`` provider.
 - Fix few ``pydocstyle`` errors in examples.
@@ -1546,8 +1288,8 @@ Misc:
 
 3.2.4
 -----
-- Switch to single version of documentation for getting shorter urls (without
-  ``/en/stable/``). Add appropriate redirects for compatibility with previous
+- Switch to single version of documentation for getting shorter urls (without 
+  ``/en/stable/``). Add appropriate redirects for compatibility with previous 
   links.
 - Update copyright date.
 
@@ -1566,7 +1308,7 @@ Misc:
 
 3.2.0
 -----
-- Add ``Configuration`` provider for late static binding of configuration
+- Add ``Configuration`` provider for late static binding of configuration 
   options.
 
 3.1.5
@@ -1576,7 +1318,7 @@ Misc:
 
 3.1.4
 -----
-- Move ``inline`` functions from class level to module level for removing them
+- Move ``inline`` functions from class level to module level for removing them 
   from virtual table and enable inlining.
 
 3.1.3
@@ -1608,34 +1350,34 @@ Misc:
 
 - **Providers**
 
-  1. All providers from ``dependency_injector.providers`` package are
+  1. All providers from ``dependency_injector.providers`` package are 
      implemented as C extension types using Cython.
   2. Add ``BaseSingleton`` super class for all singleton providers.
-  3. Make ``Singleton`` provider not thread-safe. It makes performance of
+  3. Make ``Singleton`` provider not thread-safe. It makes performance of 
      ``Singleton`` provider  10x times faster.
-  4. Add ``ThreadSafeSingleton`` provider - thread-safe version of
+  4. Add ``ThreadSafeSingleton`` provider - thread-safe version of 
      ``Singleton`` provider.
-  5. Add ``ThreadLocalSingleton`` provider - ``Singleton`` provider that uses
+  5. Add ``ThreadLocalSingleton`` provider - ``Singleton`` provider that uses 
      thread-local storage.
-  6. Remove ``provides`` attribute from ``Factory`` and ``Singleton``
+  6. Remove ``provides`` attribute from ``Factory`` and ``Singleton`` 
      providers.
-  7. Add ``set_args()`` and ``clear_args()`` methods for ``Callable``,
+  7. Add ``set_args()`` and ``clear_args()`` methods for ``Callable``, 
      ``Factory`` and ``Singleton`` providers.
 
 - **Containers**
 
-  1. Module ``dependency_injector.containers`` was split into submodules
+  1. Module ``dependency_injector.containers`` was split into submodules 
      without any functional changes.
 
 - **Utils**
 
-  1. Module ``dependency_injector.utils`` is split into
+  1. Module ``dependency_injector.utils`` is split into 
      ``dependency_injector.containers`` and ``dependency_injector.providers``.
 
 - **Miscellaneous**
 
   1. Remove ``@inject`` decorator.
-  2. Add makefile (``clean``, ``test``, ``build``, ``install``, ``uninstall``
+  2. Add makefile (``clean``, ``test``, ``build``, ``install``, ``uninstall`` 
      & ``publish`` commands).
   3. Update repository structure:
 
@@ -1702,7 +1444,7 @@ Misc:
 
 2.0.0
 ------
-- Introduce new injections style for ``Callable``, ``Factory`` &
+- Introduce new injections style for ``Callable``, ``Factory`` & 
   ``Singleton`` providers.
 - Drop providers: ``Static``, ``Value``, ``Function``, ``Class``, ``Config``.
 - Increase performance of making injections in 2 times (+100%).
@@ -1715,8 +1457,8 @@ Misc:
 
 1.17.0
 ------
-- Add ``add_injections()`` method to ``Callable``, ``DelegatedCallable``,
-  ``Factory``, ``DelegatedFactory``, ``Singleton`` and ``DelegatedSingleton``
+- Add ``add_injections()`` method to ``Callable``, ``DelegatedCallable``, 
+  ``Factory``, ``DelegatedFactory``, ``Singleton`` and ``DelegatedSingleton`` 
   providers.
 - Fix bug with accessing to declarative catalog attributes from instance level.
 
@@ -1744,14 +1486,14 @@ Misc:
 - Add "Examples" section into documentation.
 - Add "Movie Lister" example.
 - Add "Services" example.
-- Move project documentation into organisation's domain
+- Move project documentation into organisation's domain 
   (dependency-injector.ets-labs.org).
 
 1.15.2
 ------
-- [Refactoring] split ``catalogs`` module into smaller modules,
+- [Refactoring] split ``catalogs`` module into smaller modules, 
   ``catalogs`` module become a package.
-- [Refactoring] split ``providers`` module into smaller modules,
+- [Refactoring] split ``providers`` module into smaller modules, 
   ``providers`` module  become a package.
 - Update introduction documentation.
 
@@ -1761,7 +1503,7 @@ Misc:
 
 1.15.0
 ------
-- Add ``Provider.provide()`` method. ``Provider.__call__()`` become a
+- Add ``Provider.provide()`` method. ``Provider.__call__()`` become a 
   reference to ``Provider.provide()``.
 - Add provider overriding context.
 - Update main examples and README.
@@ -1791,7 +1533,7 @@ Misc:
 
 1.14.6
 ------
-- Add ``cls`` alias for ``provides`` attributes of ``Factory``,
+- Add ``cls`` alias for ``provides`` attributes of ``Factory``, 
   ``DelegatedFactory``, ``Singleton`` and ``DelegatedSingleton`` providers.
 
 1.14.5
@@ -1850,27 +1592,27 @@ Misc:
 
 1.11.1
 ------
-Previous state of *Dependency Injector* framework (0.11.0 version) is
-considered to be production ready / stable, so current release is considered
+Previous state of *Dependency Injector* framework (0.11.0 version) is 
+considered to be production ready / stable, so current release is considered 
 to be the first major release.
 
-- Increase major version.
+- Increase major version. 
 - Backward compatibility with all previous versions above 0.7.6 has been saved.
 
 0.11.0
 ------
-- Rename ``AbstractCatalog`` to ``DeclarativeCatalog``
+- Rename ``AbstractCatalog`` to ``DeclarativeCatalog`` 
   (with backward compatibility).
 - Rename ``catalog`` module to ``catalogs`` with backward compatibility.
 - Implement dynamic binding of providers for ``DeclarativeCatalog``.
 - Add ``DynamicCatalog``.
-- Change restrictions for providers-to-catalogs bindings - provider could be
+- Change restrictions for providers-to-catalogs bindings - provider could be 
   bound to several catalogs with different names.
 - Restrict overriding of providers by themselves.
 - Restrict overriding of catalogs by themselves.
-- Make ``DeclarativeCatalog.last_overriding`` attribute to be ``None`` by
+- Make ``DeclarativeCatalog.last_overriding`` attribute to be ``None`` by 
   default.
-- Make ``Provider.last_overriding`` attribute to be ``None`` by
+- Make ``Provider.last_overriding`` attribute to be ``None`` by 
   default.
 - Refactor catalogs and providers modules.
 - Add API documentation
@@ -1878,7 +1620,7 @@ to be the first major release.
 
 0.10.5
 ------
-- Add more representable implementation for ``AbstractCatalog`` and
+- Add more representable implementation for ``AbstractCatalog`` and 
   ``AbstractCatalog.Bundle``.
 
 0.10.4
@@ -1902,17 +1644,17 @@ to be the first major release.
 - Add functionality for creating ``AbstractCatalog`` provider bundles.
 - Improve ``AbstractCatalog`` inheritance.
 - Improve ``AbstractCatalog`` overriding.
-- Add images for catalog "Writing catalogs" and "Operating with catalogs"
+- Add images for catalog "Writing catalogs" and "Operating with catalogs" 
   examples.
-- Add functionality for using positional argument injections with
-  ``Factory``, ``Singleton``, ``Callable`` providers and
+- Add functionality for using positional argument injections with 
+  ``Factory``, ``Singleton``, ``Callable`` providers and 
   ``inject`` decorator.
 - Add functionality for decorating classes with ``@inject``.
-- Add ``Singleton.injections`` attribute that represents a tuple of all
+- Add ``Singleton.injections`` attribute that represents a tuple of all 
   ``Singleton`` injections (including args, kwargs, attributes and methods).
-- Add ``Callable.injections`` attribute that represents a tuple of all
+- Add ``Callable.injections`` attribute that represents a tuple of all 
   ``Callable`` injections (including args and kwargs).
-- Add optimization for ``Injection.value`` property that will compute
+- Add optimization for ``Injection.value`` property that will compute 
   type of injection once, instead of doing this on every call.
 - Add ``VERSION`` constant for verification of currently installed version.
 - Add support of Python 3.5.
@@ -1922,7 +1664,7 @@ to be the first major release.
 0.9.5
 -----
 - Change provider attributes scope to public.
-- Add ``Factory.injections`` attribute that represents a tuple of all
+- Add ``Factory.injections`` attribute that represents a tuple of all 
   ``Factory`` injections (including kwargs, attributes and methods).
 
 0.9.4
@@ -1939,14 +1681,14 @@ to be the first major release.
 
 0.9.1
 -----
-- Add simplified syntax of kwarg injections for ``di.Factory`` and
-  ``di.Singleton`` providers:
+- Add simplified syntax of kwarg injections for ``di.Factory`` and 
+  ``di.Singleton`` providers: 
   ``di.Factory(SomeClass, dependency1=injectable_provider_or_value)``.
 - Add simplified syntax of kwarg injections for ``di.Callable`` provider:
   ``di.Callable(some_callable, dependency1=injectable_provider_or_value)``
 - Add simplified syntax of kwarg injections for ``@di.inject`` decorator:
   ``@di.inject(dependency1=injectable_provider_or_value)``.
-- Optimize ``@di.inject()`` decorations when they were made several times for
+- Optimize ``@di.inject()`` decorations when they were made several times for 
   the same callback.
 - Add minor refactorings.
 - Fix of minor documentation issues.
@@ -1966,21 +1708,21 @@ to be the first major release.
 0.7.6
 -----
 
-- Adding support of six from 1.7.0 to 1.9.0.
-- Factory / Singleton providers are free from restriction to operate with
-  classes only. This feature gives a change to use factory method and
+- Adding support of six from 1.7.0 to 1.9.0. 
+- Factory / Singleton providers are free from restriction to operate with 
+  classes only. This feature gives a change to use factory method and 
   functions with Factory / Singleton providers.
-- All attributes of all entities that have to be protected was renamed using
-  ``_protected`` manner.
-- Providers extending was improved by implementing overriding logic in
-  ``Provider.__call__()`` and moving providing logic into
+- All attributes of all entities that have to be protected was renamed using 
+  ``_protected`` manner. 
+- Providers extending was improved by implementing overriding logic in 
+  ``Provider.__call__()`` and moving providing logic into 
   ``Provider._provide()``.
-- ``NewInstance`` provider was renamed to ``Factory`` provider.
-  ``NewInstance`` still can be used, but it considered to be deprecated and
+- ``NewInstance`` provider was renamed to ``Factory`` provider. 
+  ``NewInstance`` still can be used, but it considered to be deprecated and 
   will be removed in further releases.
-- ``@inject`` decorator was refactored to keep all injections in
+- ``@inject`` decorator was refactored to keep all injections in 
   ``_injections`` attribute of decorated callback. It will give a possibility to
-  track all the injections of particular callbacks and gives some performance
+  track all the injections of particular callbacks and gives some performance 
   boost due minimizing number of calls for doing injections.
 - A lot of documentation updates were made.
 - A lot of examples were added.

docs/providers/aggregate.rst

@@ -1,72 +0,0 @@
-.. _aggregate-provider:
-
-Aggregate provider
-==================
-
-.. meta::
-   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Configuration,Injection,
-              Aggregate,Polymorphism,Environment Variable,Flexibility
-   :description: Aggregate provider aggregates other providers.
-                 This page demonstrates how to implement the polymorphism and increase the
-                 flexibility of your application using the Aggregate provider.
-
-:py:class:`Aggregate` provider aggregates a group of other providers.
-
-.. currentmodule:: dependency_injector.providers
-
-.. literalinclude:: ../../examples/providers/aggregate.py
-   :language: python
-   :lines: 3-
-   :emphasize-lines: 24-27
-
-Each provider in the ``Aggregate`` is associated with a key. You can call aggregated providers by providing
-their key as a first argument. All positional and keyword arguments following the key will be forwarded to
-the called provider:
-
-.. code-block:: python
-
-   yaml_reader = container.config_readers("yaml", "./config.yml", foo=...)
-
-You can also retrieve an aggregated provider by providing its key as an attribute name:
-
-.. code-block:: python
-
-   yaml_reader = container.config_readers.yaml("./config.yml", foo=...)
-
-To retrieve a dictionary of aggregated providers, use ``.providers`` attribute:
-
-.. code-block:: python
-
-   container.config_readers.providers == {
-       "yaml": <YAML provider>,
-       "json": <JSON provider>,
-   }
-
-.. note::
-   You can not override the ``Aggregate`` provider.
-
-.. note::
-   When you inject the ``Aggregate`` provider, it is passed "as is".
-
-To use non-string keys or string keys with ``.`` and ``-``, provide a dictionary as a positional argument:
-
-.. code-block:: python
-
-   aggregate = providers.Aggregate({
-       SomeClass: providers.Factory(...),
-       "key.with.periods": providers.Factory(...),
-       "key-with-dashes": providers.Factory(...),
-   })
-
-.. seealso::
-   :ref:`selector-provider` to make injections based on a configuration value, environment variable, or a result of a callable.
-
-   ``Aggregate`` provider is different from the :ref:`selector-provider`. ``Aggregate`` provider doesn't select which provider
-   to inject and doesn't have a selector. It is a group of providers and is always injected "as is". The rest of the interface
-   of both providers is similar.
-
-.. note::
-   ``Aggregate`` provider is a successor of :ref:`factory-aggregate-provider` provider. ``Aggregate`` provider doesn't have
-   a restriction on the provider type, while ``FactoryAggregate`` aggregates only ``Factory`` providers.
-
-.. disqus::

docs/providers/configuration.rst

@@ -5,14 +5,11 @@ Configuration provider
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Configuration,Injection,
-              Option,Ini,Json,Yaml,Pydantic,Dict,Environment Variable Interpolation,
-              Environment Variable Substitution,Environment Variable in Config,
-              Environment Variable in YAML file,Environment Variable in INI file,Default,Load,Read
+              Option,Ini,Json,Yaml,Pydantic,Dict,Environment Variable,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,
-                 or a pydantic settings object. This page also describes how to substitute (interpolate)
-                 environment variables in YAML and INI configuration files.
+                 or a pydantic settings object.
 
 .. currentmodule:: dependency_injector.providers
 
@@ -45,31 +42,9 @@ where ``examples/providers/configuration/config.ini`` is:
 .. literalinclude:: ../../examples/providers/configuration/config.ini
    :language: ini
 
-Alternatively, you can provide a path to the INI file over the configuration provider argument. In that case,
-the container will call ``config.from_ini()`` automatically:
-
-.. code-block:: python
-   :emphasize-lines: 3
-
-   class Container(containers.DeclarativeContainer):
-
-       config = providers.Configuration(ini_files=["./config.ini"])
-
-
-   if __name__ == "__main__":
-       container = Container()  # Config is loaded from ./config.ini
-
-
-:py:meth:`Configuration.from_ini` method supports environment variables interpolation.
-
-.. code-block:: ini
-
-   [section]
-   option1 = ${ENV_VAR}
-   option2 = ${ENV_VAR}/path
-   option3 = ${ENV_VAR:default}
-
-See also: :ref:`configuration-envs-interpolation`.
+: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``.
 
 Loading from a YAML file
 ------------------------
@@ -87,40 +62,19 @@ where ``examples/providers/configuration/config.yml`` is:
 .. literalinclude:: ../../examples/providers/configuration/config.yml
    :language: ini
 
-Alternatively, you can provide a path to the YAML file over the configuration provider argument. In that case,
-the container will call ``config.from_yaml()`` automatically:
-
-.. code-block:: python
-   :emphasize-lines: 3
-
-   class Container(containers.DeclarativeContainer):
-
-       config = providers.Configuration(yaml_files=["./config.yml"])
-
-
-   if __name__ == "__main__":
-       container = Container()  # Config is loaded from ./config.yml
-
-:py:meth:`Configuration.from_yaml` method supports environment variables interpolation.
-
-.. code-block:: ini
-
-   section:
-     option1: ${ENV_VAR}
-     option2: ${ENV_VAR}/path
-     option3: ${ENV_VAR:default}
-
-See also: :ref:`configuration-envs-interpolation`.
-
 :py:meth:`Configuration.from_yaml` method uses custom version of ``yaml.SafeLoader``.
-To use another loader use ``loader`` argument:
+
+The loader supports environment variables interpolation. Use ``${ENV_NAME}`` format
+in the configuration file to substitute value of the environment variable ``ENV_NAME``.
+
+You can also specify a YAML loader as an argument:
 
 .. code-block:: python
 
    import yaml
 
 
-   container.config.from_yaml("config.yml", loader=yaml.UnsafeLoader)
+   container.config.from_yaml('config.yml', loader=yaml.UnsafeLoader)
 
 .. note::
 
@@ -136,102 +90,38 @@ To use another loader use ``loader`` argument:
 
    *Don't forget to mirror the changes in the requirements file.*
 
-Loading from a JSON file
-------------------------
-
-``Configuration`` provider can load configuration from a ``json`` file using the
-:py:meth:`Configuration.from_json` method:
-
-.. literalinclude:: ../../examples/providers/configuration/configuration_json.py
-   :language: python
-   :lines: 3-
-   :emphasize-lines: 12
-
-where ``examples/providers/configuration/config.json`` is:
-
-.. literalinclude:: ../../examples/providers/configuration/config.json
-   :language: json
-
-Alternatively, you can provide a path to a json file over the configuration provider argument. In that case,
-the container will call ``config.from_json()`` automatically:
-
-.. code-block:: python
-   :emphasize-lines: 3
-
-   class Container(containers.DeclarativeContainer):
-
-       config = providers.Configuration(json_files=["./config.json"])
-
-
-   if __name__ == "__main__":
-       container = Container()  # Config is loaded from ./config.json
-
-:py:meth:`Configuration.from_json` method supports environment variables interpolation.
-
-.. code-block:: json
-
-   {
-       "section": {
-           "option1": "${ENV_VAR}",
-           "option2": "${ENV_VAR}/path",
-           "option3": "${ENV_VAR:default}"
-       }
-   }
-
-See also: :ref:`configuration-envs-interpolation`.
-
 Loading from a Pydantic settings
 --------------------------------
 
-``Configuration`` provider can load configuration from a ``pydantic_settings.BaseSettings`` object using the
+``Configuration`` provider can load configuration from a ``pydantic`` settings object using the
 :py:meth:`Configuration.from_pydantic` method:
 
 .. literalinclude:: ../../examples/providers/configuration/configuration_pydantic.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 32
+   :emphasize-lines: 31
 
-To get the data from pydantic settings ``Configuration`` provider calls its ``model_dump()`` method.
+To get the data from pydantic settings ``Configuration`` provider calls ``Settings.dict()`` method.
 If you need to pass an argument to this call, use ``.from_pydantic()`` keyword arguments.
 
 .. code-block:: python
 
-   container.config.from_pydantic(Settings(), exclude={"optional"})
-
-Alternatively, you can provide a ``pydantic_settings.BaseSettings`` object over the configuration provider argument. In that case,
-the container will call ``config.from_pydantic()`` automatically:
-
-.. code-block:: python
-   :emphasize-lines: 3
-
-   class Container(containers.DeclarativeContainer):
-
-       config = providers.Configuration(pydantic_settings=[Settings()])
-
-
-   if __name__ == "__main__":
-       container = Container()  # Config is loaded from Settings()
-
+   container.config.from_pydantic(Settings(), exclude={'optional'})
 
 .. note::
 
-   ``Dependency Injector`` doesn't install ``pydantic-settings`` by default.
+   ``Dependency Injector`` doesn't install ``pydantic`` by default.
 
    You can install the ``Dependency Injector`` with an extra dependency::
 
-      pip install dependency-injector[pydantic2]
+      pip install dependency-injector[pydantic]
 
-   or install ``pydantic-settings`` directly::
+   or install ``pydantic`` directly::
 
-      pip install pydantic-settings
+      pip install pydantic
 
    *Don't forget to mirror the changes in the requirements file.*
 
-.. note::
-
-   For backward-compatibility, Pydantic v1 is still supported.
-   Passing ``pydantic.BaseSettings`` instances will work just as fine as ``pydantic_settings.BaseSettings``.
-
 Loading from a dictionary
 -------------------------
 
@@ -254,35 +144,6 @@ Loading from an environment variable
    :lines: 3-
    :emphasize-lines: 18-20
 
-You can use ``as_`` argument for the type casting of an environment variable value:
-
-.. code-block:: python
-   :emphasize-lines: 2,6,10
-
-   # API_KEY=secret
-   container.config.api_key.from_env("API_KEY", as_=str, required=True)
-   assert container.config.api_key() == "secret"
-
-   # SAMPLING_RATIO=0.5
-   container.config.sampling.from_env("SAMPLING_RATIO", as_=float, required=True)
-   assert container.config.sampling() == 0.5
-
-   # TIMEOUT undefined, default is used
-   container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
-   assert container.config.timeout() == 5
-
-
-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
 ---------------------------------
 
@@ -299,86 +160,6 @@ where ``examples/providers/configuration/config.local.yml`` is:
 .. literalinclude:: ../../examples/providers/configuration/config.local.yml
    :language: ini
 
-.. _configuration-envs-interpolation:
-
-Using environment variables in configuration files
---------------------------------------------------
-
-``Configuration`` provider supports environment variables interpolation in configuration files.
-Use ``${ENV_NAME}`` in the configuration file to substitute value from environment
-variable ``ENV_NAME``.
-
-.. code-block:: ini
-
-   section:
-     option: ${ENV_NAME}
-
-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]
-   option = ${ENV_NAME:default}
-
-If you'd like to specify a default value for environment variable inside of the application you can use
-``os.environ.setdefault()``.
-
-.. literalinclude:: ../../examples/providers/configuration/configuration_env_interpolation_os_default.py
-   :language: python
-   :lines: 3-
-   :emphasize-lines: 12
-
-If environment variable is undefined and doesn't have a default, ``Configuration`` provider
-will replace it with an empty value. This is a default behavior. To raise an error on
-undefined environment variable that doesn't have a default value, pass argument
-``envs_required=True`` to a configuration reading method:
-
-.. code-block:: python
-
-   container.config.from_yaml("config.yml", envs_required=True)
-
-See also: :ref:`configuration-strict-mode`.
-
-.. note::
-   ``Configuration`` provider makes environment variables interpolation before parsing. This preserves
-   original parser behavior. For instance, undefined environment variable in YAML configuration file
-   will be replaced with an empty value and then YAML parser will load the file.
-
-   Original configuration file:
-
-   .. code-block:: ini
-
-      section:
-        option: ${ENV_NAME}
-
-   Configuration file after interpolation where ``ENV_NAME`` is undefined:
-
-   .. code-block:: ini
-
-      section:
-        option:
-
-   Configuration provider after parsing interpolated YAML file contains ``None`` in
-   option ``section.option``:
-
-   .. code-block:: python
-
-      assert container.config.section.option() is None
-
-If you want to disable environment variables interpolation, pass ``envs_required=None``:
-
-.. code-block:: yaml
-   :caption: templates.yml
-
-   template_string: 'Hello, ${name}!'
-
-.. code-block:: python
-
-   >>> container.config.from_yaml("templates.yml", envs_required=None)
-   >>> container.config.template_string()
-   'Hello, ${name}!'
-
 Mandatory and optional sources
 ------------------------------
 
@@ -394,13 +175,13 @@ Mandatory YAML file:
 
 .. code-block:: python
 
-   container.config.from_yaml("config.yaml", required=True)
+   container.config.from_yaml('config.yaml', required=True)
 
 Mandatory INI file:
 
 .. code-block:: python
 
-   container.config.from_ini("config.ini", required=True)
+   container.config.from_ini('config.ini', required=True)
 
 Mandatory dictionary:
 
@@ -412,7 +193,7 @@ Mandatory environment variable:
 
 .. code-block:: python
 
-   container.config.api_key.from_env("API_KEY", required=True)
+   container.config.api_key.from_env('API_KEY', required=True)
 
 See also: :ref:`configuration-strict-mode`.
 
@@ -470,16 +251,16 @@ configuration data is undefined:
        config = providers.Configuration(strict=True)
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
 
        try:
-           container.config.from_yaml("does-not_exist.yml")  # raise exception
+           container.config.from_yaml('does-not_exist.yml')  # raise exception
        except FileNotFoundError:
            ...
 
        try:
-           container.config.from_ini("does-not_exist.ini")  # raise exception
+           container.config.from_ini('does-not_exist.ini')  # raise exception
        except FileNotFoundError:
            ...
 
@@ -489,7 +270,7 @@ configuration data is undefined:
            ...
 
        try:
-           container.config.from_env("UNDEFINED_ENV_VAR")  # raise exception
+           container.config.from_env('UNDEFINED_ENV_VAR')  # raise exception
        except ValueError:
            ...
 
@@ -498,21 +279,6 @@ configuration data is undefined:
        except ValueError:
            ...
 
-Environment variables interpolation in strict mode raises an exception when encounters
-an undefined environment variable without a default value.
-
-.. code-block:: ini
-
-   section:
-     option: ${UNDEFINED}
-
-.. code-block:: python
-
-       try:
-           container.config.from_yaml("undefined_env.yml")  # raise exception
-       except ValueError:
-           ...
-
 You can override ``.from_*()`` methods behaviour in strict mode using ``required`` argument:
 
 .. code-block:: python
@@ -522,11 +288,11 @@ You can override ``.from_*()`` methods behaviour in strict mode using ``required
        config = providers.Configuration(strict=True)
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
 
-       container.config.from_yaml("config.yml")
-       container.config.from_yaml("config.local.yml", required=False)
+       container.config.from_yaml('config.yml')
+       container.config.from_yaml('config.local.yml', required=False)
 
 You can also use ``.required()`` option modifier when making an injection. It does not require to switch
 configuration provider to strict mode.

docs/providers/custom.rst

@@ -16,11 +16,10 @@ To create a custom provider you need to follow these rules:
 1. New provider class should inherit :py:class:`Provider`.
 2. You need to implement the ``Provider._provide()`` method.
 3. You need to implement the ``Provider.__deepcopy__()`` method. It should return an
-   equivalent copy of a provider. All providers must be copied with the ``deepcopy()`` function
-   from the ``providers`` module. It's essential to pass ``memo`` into ``deepcopy`` in order to keep
-   the preconfigured ``args`` and ``kwargs`` of stored providers. After the a new provider object
-   is created, use ``Provider._copy_overriding()`` method to copy all overriding providers. See the
-   example below.
+   equivalent copy of a provider. All providers must be copied with a ``deepcopy()`` function
+   from the ``providers`` module. After the a new provider object is created use
+   ``Provider._copy_overriding()`` method to copy all overriding providers. See the example
+   below.
 4. If new provider has a ``__init__()`` method, it should call the parent
    ``Provider.__init__()``.
 5. If new provider stores any other providers, these providers should be listed in
@@ -34,7 +33,7 @@ To create a custom provider you need to follow these rules:
 .. note::
    1. Prefer delegation over inheritance. If you choose between inheriting a ``Factory`` or
       inheriting a ``Provider`` and use ``Factory`` internally - the last is better.
-   2. When creating a new provider follow the ``Factory``-like injections style. Consistency matters.
+   2. When create a new provider follow the ``Factory``-like injections style. Consistency matters.
    3. Use the ``__slots__`` attribute to make sure nothing could be attached to your provider. You
       will also save some memory.
 

docs/providers/dict.rst

@@ -23,8 +23,8 @@ To use non-string keys or keys with ``.`` and ``-`` provide a dictionary as a po
 
    providers.Dict({
        SomeClass: providers.Factory(...),
-       "key.with.periods": providers.Factory(...),
-       "key-with-dashes": providers.Factory(...),
+       'key.with.periods': providers.Factory(...),
+       'key-with-dashes': providers.Factory(...),
    })
 
 Example:

docs/providers/factory.rst

@@ -110,45 +110,6 @@ attribute of the provider that you're going to inject.
 
 .. note:: Any provider has a ``.provider`` attribute.
 
-.. _factory-string-imports:
-
-String imports
---------------
-
-``Factory`` provider can handle string imports:
-
-.. code-block:: python
-
-   class Container(containers.DeclarativeContainer):
-
-       service = providers.Factory("myapp.mypackage.mymodule.Service")
-
-You can also make a relative import:
-
-.. code-block:: python
-
-   # in myapp/container.py
-
-   class Container(containers.DeclarativeContainer):
-
-       service = providers.Factory(".mypackage.mymodule.Service")
-
-or import a member of the current module just specifying its name:
-
-.. code-block:: python
-
-   class Service:
-       ...
-
-
-   class Container(containers.DeclarativeContainer):
-
-       service = providers.Factory("Service")
-
-.. note::
-   ``Singleton``, ``Callable``, ``Resource``, and ``Coroutine`` providers handle string imports
-   the same way as a ``Factory`` provider.
-
 .. _factory-specialize-provided-type:
 
 Specializing the provided type
@@ -184,20 +145,16 @@ provider with two peculiarities:
    :lines: 3-
    :emphasize-lines: 34
 
-.. _factory-aggregate-provider:
-
 Factory aggregate
 -----------------
 
-:py:class:`FactoryAggregate` provider aggregates multiple factories.
+:py:class:`FactoryAggregate` provider aggregates multiple factories. When you call the
+``FactoryAggregate`` it delegates the call to one of the factories.
 
-.. seealso::
-   :ref:`aggregate-provider` – it's a successor of ``FactoryAggregate`` provider that can aggregate
-   any type of provider, not only ``Factory``.
-
-The aggregated factories are associated with the string keys. When you call the
-``FactoryAggregate`` you have to provide one of the these keys as a first argument.
-``FactoryAggregate`` looks for the factory with a matching key and calls it with the rest of the arguments.
+The aggregated factories are associated with the string names. When you call the
+``FactoryAggregate`` you have to provide one of the these names as a first argument.
+``FactoryAggregate`` looks for the factory with a matching name and delegates it the work. The
+rest of the arguments are passed to the delegated ``Factory``.
 
 .. image:: images/factory_aggregate.png
     :width: 100%
@@ -208,12 +165,12 @@ The aggregated factories are associated with the string keys. When you call the
    :lines: 3-
    :emphasize-lines: 33-37,47
 
-You can get a dictionary of the aggregated providers using ``.providers`` attribute.
-To get a game provider dictionary from the previous example you can use
-``game_factory.providers`` attribute.
+You can get a dictionary of the aggregated factories using the ``.factories`` attribute of the
+``FactoryAggregate``. To get a game factories dictionary from the previous example you can use
+``game_factory.factories`` attribute.
 
 You can also access an aggregated factory as an attribute. To create the ``Chess`` object from the
-previous example you can do ``chess = game_factory.chess("John", "Jane")``.
+previous example you can do ``chess = game_factory.chess('John', 'Jane')``.
 
 .. note::
    You can not override the ``FactoryAggregate`` provider.
@@ -221,22 +178,4 @@ previous example you can do ``chess = game_factory.chess("John", "Jane")``.
 .. note::
    When you inject the ``FactoryAggregate`` provider it is passed "as is".
 
-To use non-string keys or string keys with ``.`` and ``-``, you can provide a dictionary as a positional argument:
-
-.. code-block:: python
-
-   providers.FactoryAggregate({
-       SomeClass: providers.Factory(...),
-       "key.with.periods": providers.Factory(...),
-       "key-with-dashes": providers.Factory(...),
-   })
-
-Example:
-
-.. literalinclude:: ../../examples/providers/factory_aggregate_non_string_keys.py
-   :language: python
-   :lines: 3-
-   :emphasize-lines: 30-33,39-40
-
-
 .. disqus::

docs/providers/index.rst

@@ -46,7 +46,6 @@ Providers module API docs - :py:mod:`dependency_injector.providers`
     dict
     configuration
     resource
-    aggregate
     selector
     dependency
     overriding

docs/providers/resource.rst

@@ -98,7 +98,7 @@ you configure global resource:
 
        configure_logging = providers.Resource(
            logging.config.fileConfig,
-           fname="logging.ini",
+           fname='logging.ini',
        )
 
 Function initializer does not provide a way to specify custom resource shutdown.
@@ -210,8 +210,8 @@ first argument.
 
 .. _resource-provider-wiring-closing:
 
-Resources, wiring, and per-function execution scope
----------------------------------------------------
+Resources, wiring and per-function execution scope
+--------------------------------------------------
 
 You can compound ``Resource`` provider with :ref:`wiring` to implement per-function
 execution scope. For doing this you need to use additional ``Closing`` marker from
@@ -220,7 +220,7 @@ execution scope. For doing this you need to use additional ``Closing`` marker fr
 .. literalinclude:: ../../examples/wiring/flask_resource_closing.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 22
+   :emphasize-lines: 24
 
 Framework initializes and injects the resource into the function. With the ``Closing`` marker
 framework calls resource ``shutdown()`` method when function execution is over.
@@ -325,7 +325,7 @@ When you use resource provider with asynchronous initializer you need to call it
        connection = await container.connection.shutdown()
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        asyncio.run(main())
 
 Container ``init_resources()`` and ``shutdown_resources()`` methods should be used asynchronously if there is
@@ -349,7 +349,7 @@ at least one asynchronous resource provider:
        await container.shutdown_resources()
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        asyncio.run(main())
 
 See also:

docs/providers/selector.rst

@@ -30,7 +30,4 @@ When a ``Selector`` provider is called, it gets a ``selector`` value and delegat
 the provider with a matching name. The ``selector`` callable works as a switch: when the returned
 value is changed the ``Selector`` provider will delegate the work to another provider.
 
-.. seealso::
-   :ref:`aggregate-provider` to inject a group of providers.
-
 .. disqus::

docs/providers/singleton.rst

@@ -24,7 +24,7 @@ returns it on the rest of the calls.
 
 .. note::
 
-   ``Singleton`` provider makes dependencies injection only when it creates an object. When an object
+   ``Singleton`` provider makes dependencies injection only when creates an object. When an object
    is created and memorized ``Singleton`` provider just returns it without applying injections.
 
 Specialization of the provided type and abstract singletons work the same like like for the

docs/providers/typing_mypy.rst

@@ -30,7 +30,7 @@ IDE.
    provider = providers.Factory(Cat)
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        animal = provider()  # mypy knows that animal is of type "Cat"
 
 
@@ -54,7 +54,5 @@ function or method.
    provider: providers.Provider[Animal] = providers.Factory(Cat)
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        animal = provider()  # mypy knows that animal is of type "Animal"
-
-.. disqus::

docs/sponsor.rst

@@ -1,7 +0,0 @@
-.. list-table::
-  :class: no-border
-  :align: left
-
-  * - Sponsor the project on GitHub:
-    - .. raw:: html
-         :file: _static/sponsor.html

docs/tutorials/aiohttp.rst

@@ -127,6 +127,8 @@ Now it's time to install the project requirements. We will use next packages:
 
 - ``dependency-injector`` - the dependency injection framework
 - ``aiohttp`` - the web framework
+- ``aiohttp-devtools`` - the helper library that will provide a development server with live
+  reloading
 - ``pyyaml`` - the YAML files parsing library, used for the reading of the configuration files
 - ``pytest-aiohttp`` - the helper library for the testing of the ``aiohttp`` application
 - ``pytest-cov`` - the helper library for measuring the test coverage
@@ -137,6 +139,7 @@ Put next lines into the ``requirements.txt`` file:
 
    dependency-injector
    aiohttp
+   aiohttp-devtools
    pyyaml
    pytest-aiohttp
    pytest-cov
@@ -174,16 +177,16 @@ Edit ``handlers.py``:
 
 
    async def index(request: web.Request) -> web.Response:
-       query = request.query.get("query", "Dependency Injector")
-       limit = int(request.query.get("limit", 10))
+       query = request.query.get('query', 'Dependency Injector')
+       limit = int(request.query.get('limit', 10))
 
        gifs = []
 
        return web.json_response(
            {
-               "query": query,
-               "limit": limit,
-               "gifs": gifs,
+               'query': query,
+               'limit': limit,
+               'gifs': gifs,
            },
        )
 
@@ -225,35 +228,30 @@ Put next into the ``application.py``:
        app = web.Application()
        app.container = container
        app.add_routes([
-           web.get("/", handlers.index),
+           web.get('/', handlers.index),
        ])
        return app
 
-
-   if __name__ == "__main__":
-       app = create_app()
-       web.run_app(app)
-
 Now we're ready to run our application
 
 Do next in the terminal:
 
 .. code-block:: bash
 
-   python -m giphynavigator.application
+   adev runserver giphynavigator/application.py --livereload
 
 The output should be something like:
 
 .. code-block:: bash
 
-   ======== Running on http://0.0.0.0:8080 ========
-   (Press CTRL+C to quit)
+   [18:52:59] Starting aux server at http://localhost:8001 ◆
+   [18:52:59] Starting dev server at http://localhost:8000 ●
 
 Let's check that it works. Open another terminal session and use ``httpie``:
 
 .. code-block:: bash
 
-   http http://0.0.0.0:8080/
+   http http://127.0.0.1:8000/
 
 You should see:
 
@@ -263,7 +261,7 @@ You should see:
    Content-Length: 844
    Content-Type: application/json; charset=utf-8
    Date: Wed, 29 Jul 2020 21:01:50 GMT
-   Server: Python/3.10 aiohttp/3.6.2
+   Server: Python/3.8 aiohttp/3.6.2
 
    {
        "gifs": [],
@@ -306,7 +304,7 @@ and put next into it:
 
    class GiphyClient:
 
-       API_URL = "https://api.giphy.com/v1"
+       API_URL = 'https://api.giphy.com/v1'
 
        def __init__(self, api_key, timeout):
            self._api_key = api_key
@@ -314,11 +312,11 @@ and put next into it:
 
        async def search(self, query, limit):
            """Make search API call and return result."""
-           url = f"{self.API_URL}/gifs/search"
+           url = f'{self.API_URL}/gifs/search'
            params = {
-               "q": query,
-               "api_key": self._api_key,
-               "limit": limit,
+               'q': query,
+               'api_key': self._api_key,
+               'limit': limit,
            }
            async with ClientSession(timeout=self._timeout) as session:
                async with session.get(url, params=params) as response:
@@ -330,10 +328,8 @@ Now we need to add ``GiphyClient`` into the container. The ``GiphyClient`` has t
 that have to be injected: the API key and the request timeout. We will need to use two more
 providers from the ``dependency_injector.providers`` module:
 
-- ``Factory`` provider. It will create a ``GiphyClient`` client.
-- ``Configuration`` provider. It will provide an API key and a request timeout for the ``GiphyClient``
-  client. We will specify the location of the configuration file. The configuration provider will parse
-  the configuration file when we create a container instance.
+- ``Factory`` provider that will create the ``GiphyClient`` client.
+- ``Configuration`` provider that will provide the API key and the request timeout.
 
 Edit ``containers.py``:
 
@@ -349,7 +345,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        giphy_client = providers.Factory(
            giphy.GiphyClient,
@@ -357,8 +353,18 @@ Edit ``containers.py``:
            timeout=config.giphy.request_timeout,
        )
 
-Now let's add the configuration file. We will use YAML. Create an empty file ``config.yml`` in
-the root root of the project:
+.. note::
+
+   We have used the configuration value before it was defined. That's the principle how the
+   ``Configuration`` provider works.
+
+   Use first, define later.
+
+Now let's add the configuration file.
+
+We will use YAML.
+
+Create an empty file ``config.yml`` in the root root of the project:
 
 .. code-block:: bash
    :emphasize-lines: 9
@@ -381,14 +387,17 @@ and put next into it:
    giphy:
      request_timeout: 10
 
+We will use an environment variable ``GIPHY_API_KEY`` to provide the API key.
 
-We will use the ``GIPHY_API_KEY`` environment variable to provide the API key. Let’s edit
-``create_app()`` to fetch the key value from it.
+Now we need to edit ``create_app()`` to make two things when application starts:
+
+- Load the configuration file the ``config.yml``.
+- Load the API key from the ``GIPHY_API_KEY`` environment variable.
 
 Edit ``application.py``:
 
 .. code-block:: python
-   :emphasize-lines: 11
+   :emphasize-lines: 11-12
 
    """Application module."""
 
@@ -400,20 +409,17 @@ Edit ``application.py``:
 
    def create_app() -> web.Application:
        container = Container()
-       container.config.giphy.api_key.from_env("GIPHY_API_KEY")
+       container.config.from_yaml('config.yml')
+       container.config.giphy.api_key.from_env('GIPHY_API_KEY')
 
        app = web.Application()
        app.container = container
        app.add_routes([
-           web.get("/", handlers.index),
+           web.get('/', handlers.index),
        ])
        return app
 
 
-   if __name__ == "__main__":
-       app = create_app()
-       web.run_app(app)
-
 Now we need to create an API key and set it to the environment variable.
 
 As for now, don’t worry, just take this one:
@@ -477,7 +483,7 @@ and put next into it:
 
            result = await self._giphy_client.search(query, limit)
 
-           return [{"url": gif["url"]} for gif in result["data"]]
+           return [{'url': gif['url']} for gif in result['data']]
 
 The ``SearchService`` has a dependency on the ``GiphyClient``. This dependency will be
 injected when we add ``SearchService`` to the container.
@@ -496,7 +502,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        giphy_client = providers.Factory(
            giphy.GiphyClient,
@@ -525,7 +531,7 @@ Edit ``handlers.py``:
    """Handlers module."""
 
    from aiohttp import web
-   from dependency_injector.wiring import Provide, inject
+   from dependency_injector.wiring import inject, Provide
 
    from .services import SearchService
    from .containers import Container
@@ -536,63 +542,60 @@ Edit ``handlers.py``:
            request: web.Request,
            search_service: SearchService = Provide[Container.search_service],
    ) -> web.Response:
-       query = request.query.get("query", "Dependency Injector")
-       limit = int(request.query.get("limit", 10))
+       query = request.query.get('query', 'Dependency Injector')
+       limit = int(request.query.get('limit', 10))
 
        gifs = await search_service.search(query, limit)
 
        return web.json_response(
            {
-               "query": query,
-               "limit": limit,
-               "gifs": gifs,
+               'query': query,
+               'limit': limit,
+               'gifs': gifs,
            },
        )
 
-To make the injection work we need to wire the container with the ``handlers`` module.
-Let's configure the container to automatically make wiring with the ``handlers`` module when we
-create a container instance.
+To make the injection work we need to wire the container instance with the ``handlers`` module.
+This needs to be done once. After it's done we can use ``Provide`` markers to specify as many
+injections as needed for any handler.
 
-Edit ``containers.py``:
+Edit ``application.py``:
 
 .. code-block:: python
-   :emphasize-lines: 10
+   :emphasize-lines: 13
 
-   """Containers module."""
+   """Application module."""
 
-   from dependency_injector import containers, providers
+   from aiohttp import web
 
-   from . import giphy, services
+   from .containers import Container
+   from . import handlers
 
 
-   class Container(containers.DeclarativeContainer):
+   def create_app() -> web.Application:
+       container = Container()
+       container.config.from_yaml('config.yml')
+       container.config.giphy.api_key.from_env('GIPHY_API_KEY')
+       container.wire(modules=[handlers])
 
-       wiring_config = containers.WiringConfiguration(modules=[".handlers"])
+       app = web.Application()
+       app.container = container
+       app.add_routes([
+           web.get('/', handlers.index),
+       ])
+       return app
 
-       config = providers.Configuration(yaml_files=["config.yml"])
-
-       giphy_client = providers.Factory(
-           giphy.GiphyClient,
-           api_key=config.giphy.api_key,
-           timeout=config.giphy.request_timeout,
-       )
-
-       search_service = providers.Factory(
-           services.SearchService,
-           giphy_client=giphy_client,
-       )
-
-Make sure the app is running:
+Make sure the app is running or use:
 
 .. code-block:: bash
 
-   python -m giphynavigator.application
+   adev runserver giphynavigator/application.py --livereload
 
 and make a request to the API in the terminal:
 
 .. code-block:: bash
 
-   http http://0.0.0.0:8080/ query=="wow,it works" limit==5
+   http http://localhost:8000/ query=="wow,it works" limit==5
 
 You should see:
 
@@ -602,7 +605,7 @@ You should see:
    Content-Length: 492
    Content-Type: application/json; charset=utf-8
    Date: Fri, 09 Oct 2020 01:35:48 GMT
-   Server: Python/3.10 aiohttp/3.6.2
+   Server: Python/3.8 aiohttp/3.6.2
 
    {
        "gifs": [
@@ -648,7 +651,7 @@ Edit ``handlers.py``:
    """Handlers module."""
 
    from aiohttp import web
-   from dependency_injector.wiring import Provide, inject
+   from dependency_injector.wiring import inject, Provide
 
    from .services import SearchService
    from .containers import Container
@@ -661,16 +664,16 @@ Edit ``handlers.py``:
            default_query: str = Provide[Container.config.default.query],
            default_limit: int = Provide[Container.config.default.limit.as_int()],
    ) -> web.Response:
-       query = request.query.get("query", default_query)
-       limit = int(request.query.get("limit", default_limit))
+       query = request.query.get('query', default_query)
+       limit = int(request.query.get('limit', default_limit))
 
        gifs = await search_service.search(query, limit)
 
        return web.json_response(
            {
-               "query": query,
-               "limit": limit,
-               "gifs": gifs,
+               'query': query,
+               'limit': limit,
+               'gifs': gifs,
            },
        )
 
@@ -742,29 +745,29 @@ and put next into it:
    async def test_index(client, app):
        giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
        giphy_client_mock.search.return_value = {
-           "data": [
-               {"url": "https://giphy.com/gif1.gif"},
-               {"url": "https://giphy.com/gif2.gif"},
+           'data': [
+               {'url': 'https://giphy.com/gif1.gif'},
+               {'url': 'https://giphy.com/gif2.gif'},
            ],
        }
 
        with app.container.giphy_client.override(giphy_client_mock):
            response = await client.get(
-               "/",
+               '/',
                params={
-                   "query": "test",
-                   "limit": 10,
+                   'query': 'test',
+                   'limit': 10,
                },
            )
 
        assert response.status == 200
        data = await response.json()
        assert data == {
-           "query": "test",
-           "limit": 10,
-           "gifs": [
-               {"url": "https://giphy.com/gif1.gif"},
-               {"url": "https://giphy.com/gif2.gif"},
+           'query': 'test',
+           'limit': 10,
+           'gifs': [
+               {'url': 'https://giphy.com/gif1.gif'},
+               {'url': 'https://giphy.com/gif2.gif'},
            ],
        }
 
@@ -772,30 +775,30 @@ and put next into it:
    async def test_index_no_data(client, app):
        giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
        giphy_client_mock.search.return_value = {
-           "data": [],
+           'data': [],
        }
 
        with app.container.giphy_client.override(giphy_client_mock):
-           response = await client.get("/")
+           response = await client.get('/')
 
        assert response.status == 200
        data = await response.json()
-       assert data["gifs"] == []
+       assert data['gifs'] == []
 
 
    async def test_index_default_params(client, app):
        giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
        giphy_client_mock.search.return_value = {
-           "data": [],
+           'data': [],
        }
 
        with app.container.giphy_client.override(giphy_client_mock):
-           response = await client.get("/")
+           response = await client.get('/')
 
        assert response.status == 200
        data = await response.json()
-       assert data["query"] == app.container.config.default.query()
-       assert data["limit"] == app.container.config.default.limit()
+       assert data['query'] == app.container.config.default.query()
+       assert data['limit'] == app.container.config.default.limit()
 
 Now let's run it and check the coverage:
 
@@ -807,24 +810,24 @@ You should see:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
-   plugins: asyncio-0.16.0, anyio-3.3.4, aiohttp-0.3.0, cov-3.0.0
+   platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1
+   plugins: cov-2.10.0, aiohttp-0.3.0, asyncio-0.14.0
    collected 3 items
 
    giphynavigator/tests.py ...                                     [100%]
 
-   ---------- coverage: platform darwin, python 3.10.0-final-0 ----------
+   ---------- coverage: platform darwin, python 3.8.3-final-0 -----------
    Name                            Stmts   Miss  Cover
    ---------------------------------------------------
    giphynavigator/__init__.py          0      0   100%
-   giphynavigator/application.py      13      2    85%
-   giphynavigator/containers.py        7      0   100%
+   giphynavigator/application.py      12      0   100%
+   giphynavigator/containers.py        6      0   100%
    giphynavigator/giphy.py            14      9    36%
    giphynavigator/handlers.py         10      0   100%
    giphynavigator/services.py          9      1    89%
    giphynavigator/tests.py            37      0   100%
    ---------------------------------------------------
-   TOTAL                              90     12    87%
+   TOTAL                              88     10    89%
 
 .. note::
 
@@ -859,6 +862,4 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/tutorials/asyncio-daemon.rst

@@ -18,7 +18,7 @@ In this tutorial we will use:
 
 - Python 3
 - Docker
-- Docker Compose
+- Docker-compose
 
 Start from the scratch or jump to the section:
 
@@ -47,27 +47,28 @@ response it will log:
 Prerequisites
 -------------
 
-We will use `docker compose <https://docs.docker.com/compose/>`_ in this tutorial. Let's check the versions:
+We will use `Docker <https://www.docker.com/>`_ and
+`docker-compose <https://docs.docker.com/compose/>`_ in this tutorial. Let's check the versions:
 
 .. code-block:: bash
 
    docker --version
-   docker compose version
+   docker-compose --version
 
 The output should look something like:
 
 .. code-block:: bash
 
-   Docker version 27.3.1, build ce12230
-   Docker Compose version v2.29.7
+   Docker version 19.03.12, build 48a66213fe
+   docker-compose version 1.26.2, build eefe0d31
 
 .. note::
 
-   If you don't have ``Docker`` or ``docker compose`` you need to install them before proceeding.
+   If you don't have ``Docker`` or ``docker-compose`` you need to install them before proceeding.
    Follow these installation guides:
 
    - `Install Docker <https://docs.docker.com/get-docker/>`_
-   - `Install docker compose <https://docs.docker.com/compose/install/>`_
+   - `Install docker-compose <https://docs.docker.com/compose/install/>`_
 
 The prerequisites are satisfied. Let's get started with the project layout.
 
@@ -128,13 +129,13 @@ Put next lines into the ``requirements.txt`` file:
    pytest-cov
 
 Second, we need to create the ``Dockerfile``. It will describe the daemon's build process and
-specify how to run it. We will use ``python:3.13-bookworm`` as a base image.
+specify how to run it. We will use ``python:3.8-buster`` as a base image.
 
 Put next lines into the ``Dockerfile`` file:
 
 .. code-block:: bash
 
-   FROM python:3.13-bookworm
+   FROM python:3.8-buster
 
    ENV PYTHONUNBUFFERED=1
 
@@ -154,6 +155,8 @@ Put next lines into the ``docker-compose.yml`` file:
 
 .. code-block:: yaml
 
+   version: "3.7"
+
    services:
 
      monitor:
@@ -168,7 +171,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker compose build
+   docker-compose build
 
 The build process may take a couple of minutes. You should see something like this in the end:
 
@@ -181,7 +184,7 @@ After the build is done run the container:
 
 .. code-block:: bash
 
-   docker compose up
+   docker-compose up
 
 The output should look like:
 
@@ -201,11 +204,11 @@ Logging and configuration
 
 In this section we will configure the logging and configuration file parsing.
 
-Let's start with the the main part of our application – the container. Container will keep all of
+Let's start with the the main part of our application - the container. Container will keep all of
 the application components and their dependencies.
 
-First two components that we're going to add are the configuration provider and the resource provider
-for configuring the logging.
+First two components that we're going to add are the config object and the provider for
+configuring the logging.
 
 Put next lines into the ``containers.py`` file:
 
@@ -221,7 +224,7 @@ Put next lines into the ``containers.py`` file:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        logging = providers.Resource(
            logging.basicConfig,
@@ -230,7 +233,16 @@ Put next lines into the ``containers.py`` file:
            format=config.log.format,
        )
 
-The configuration file will keep the logging settings. Put next lines into the ``config.yml`` file:
+.. note::
+
+   We have used the configuration value before it was defined. That's the principle how the
+   ``Configuration`` provider works.
+
+   Use first, define later.
+
+The configuration file will keep the logging settings.
+
+Put next lines into the ``config.yml`` file:
 
 .. code-block:: yaml
 
@@ -238,10 +250,9 @@ The configuration file will keep the logging settings. Put next lines into the `
      level: "INFO"
      format: "[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s"
 
-Now let's create the function that will run our daemon. It's traditionally called ``main()``.
-The ``main()`` function will start the dispatcher, but we will keep it empty for now.
-We will create the container instance before calling ``main()`` in ``if __name__ == "__main__"``.
-Container instance will parse ``config.yml`` and then we will call the logging configuration provider.
+Now let's create the function that will run our daemon. It's traditionally called
+``main()``. The ``main()`` function will create the container. Then it will use the container
+to parse the ``config.yml`` file and call the logging configuration provider.
 
 Put next lines into the ``__main__.py`` file:
 
@@ -256,8 +267,9 @@ Put next lines into the ``__main__.py`` file:
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
+       container.config.from_yaml('config.yml')
        container.init_resources()
 
        main()
@@ -344,7 +356,7 @@ and next into the ``dispatcher.py``:
            asyncio.run(self.start())
 
        async def start(self) -> None:
-           self._logger.info("Starting up")
+           self._logger.info('Starting up')
 
            for monitor in self._monitors:
                self._monitor_tasks.append(
@@ -364,11 +376,11 @@ and next into the ``dispatcher.py``:
 
            self._stopping = True
 
-           self._logger.info("Shutting down")
+           self._logger.info('Shutting down')
            for task, monitor in zip(self._monitor_tasks, self._monitors):
                task.cancel()
            self._monitor_tasks.clear()
-           self._logger.info("Shutdown finished successfully")
+           self._logger.info('Shutdown finished successfully')
 
        @staticmethod
        async def _run_monitor(monitor: Monitor) -> None:
@@ -384,7 +396,7 @@ and next into the ``dispatcher.py``:
                except asyncio.CancelledError:
                    break
                except Exception:
-                   monitor.logger.exception("Error executing monitor check")
+                   monitor.logger.exception('Error executing monitor check')
 
                await asyncio.sleep(_until_next(last=time_start))
 
@@ -407,7 +419,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        logging = providers.Resource(
            logging.basicConfig,
@@ -430,11 +442,13 @@ and call the ``run()`` method. We will use :ref:`wiring` feature.
 Edit ``__main__.py``:
 
 .. code-block:: python
-   :emphasize-lines: 3-5,9-11,17
+   :emphasize-lines: 3-7,11-13,20
 
    """Main module."""
 
-   from dependency_injector.wiring import Provide, inject
+   import sys
+
+   from dependency_injector.wiring import inject, Provide
 
    from .dispatcher import Dispatcher
    from .containers import Container
@@ -445,10 +459,11 @@ Edit ``__main__.py``:
        dispatcher.run()
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
+       container.config.from_yaml('config.yml')
        container.init_resources()
-       container.wire(modules=[__name__])
+       container.wire(modules=[sys.modules[__name__]])
 
        main()
 
@@ -458,7 +473,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker compose up
+   docker-compose up
 
 The output should look like:
 
@@ -546,7 +561,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        logging = providers.Resource(
            logging.basicConfig,
@@ -598,10 +613,10 @@ Edit ``monitors.py``:
                options: Dict[str, Any],
        ) -> None:
            self._client = http_client
-           self._method = options.pop("method")
-           self._url = options.pop("url")
-           self._timeout = options.pop("timeout")
-           super().__init__(check_every=options.pop("check_every"))
+           self._method = options.pop('method')
+           self._url = options.pop('url')
+           self._timeout = options.pop('timeout')
+           super().__init__(check_every=options.pop('check_every'))
 
        async def check(self) -> None:
            time_start = time.time()
@@ -616,11 +631,11 @@ Edit ``monitors.py``:
            time_took = time_end - time_start
 
            self.logger.info(
-               "Check\n"
-               "    %s %s\n"
-               "    response code: %s\n"
-               "    content length: %s\n"
-               "    request took: %s seconds",
+               'Check\n'
+               '    %s %s\n'
+               '    response code: %s\n'
+               '    content length: %s\n'
+               '    request took: %s seconds',
                self._method,
                self._url,
                response.status,
@@ -651,7 +666,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        logging = providers.Resource(
            logging.basicConfig,
@@ -702,7 +717,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker compose up
+   docker-compose up
 
 You should see:
 
@@ -750,7 +765,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        logging = providers.Resource(
            logging.basicConfig,
@@ -810,7 +825,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker compose up
+   docker-compose up
 
 You should see:
 
@@ -875,7 +890,7 @@ Create ``tests.py`` in the ``monitoringdaemon`` package:
 and put next into it:
 
 .. code-block:: python
-   :emphasize-lines: 54,70-73
+   :emphasize-lines: 54,70-71
 
    """Tests module."""
 
@@ -896,33 +911,33 @@ and put next into it:
 
    @pytest.fixture
    def container():
-       return Container(
-           config={
-               "log": {
-                   "level": "INFO",
-                   "formant": "[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s",
+       container = Container()
+       container.config.from_dict({
+           'log': {
+               'level': 'INFO',
+               'formant': '[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s',
+           },
+           'monitors': {
+               'example': {
+                   'method': 'GET',
+                   'url': 'http://fake-example.com',
+                   'timeout': 1,
+                   'check_every': 1,
                },
-               "monitors": {
-                   "example": {
-                       "method": "GET",
-                       "url": "http://fake-example.com",
-                       "timeout": 1,
-                       "check_every": 1,
-                   },
-                   "httpbin": {
-                       "method": "GET",
-                       "url": "https://fake-httpbin.org/get",
-                       "timeout": 1,
-                       "check_every": 1,
-                   },
+               'httpbin': {
+                   'method': 'GET',
+                   'url': 'https://fake-httpbin.org/get',
+                   'timeout': 1,
+                   'check_every': 1,
                },
-           }
-       )
+           },
+       })
+       return container
 
 
    @pytest.mark.asyncio
    async def test_example_monitor(container, caplog):
-       caplog.set_level("INFO")
+       caplog.set_level('INFO')
 
        http_client_mock = mock.AsyncMock()
        http_client_mock.request.return_value = RequestStub(
@@ -934,22 +949,21 @@ and put next into it:
            example_monitor = container.example_monitor()
            await example_monitor.check()
 
-       assert "http://fake-example.com" in caplog.text
-       assert "response code: 200" in caplog.text
-       assert "content length: 635" in caplog.text
+       assert 'http://fake-example.com' in caplog.text
+       assert 'response code: 200' in caplog.text
+       assert 'content length: 635' in caplog.text
 
 
    @pytest.mark.asyncio
    async def test_dispatcher(container, caplog, event_loop):
-       caplog.set_level("INFO")
+       caplog.set_level('INFO')
 
        example_monitor_mock = mock.AsyncMock()
        httpbin_monitor_mock = mock.AsyncMock()
 
-       with container.override_providers(
-               example_monitor=example_monitor_mock,
-               httpbin_monitor=httpbin_monitor_mock,
-       ):
+       with container.example_monitor.override(example_monitor_mock), \
+               container.httpbin_monitor.override(httpbin_monitor_mock):
+
            dispatcher = container.dispatcher()
            event_loop.create_task(dispatcher.start())
            await asyncio.sleep(0.1)
@@ -962,32 +976,31 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
+   docker-compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
 
 You should see:
 
 .. code-block:: bash
 
-   platform linux -- Python 3.13.1, pytest-8.3.4, pluggy-1.5.0
+   platform linux -- Python 3.8.3, pytest-6.0.1, py-1.9.0, pluggy-0.13.1
    rootdir: /code
-   plugins: cov-6.0.0, asyncio-0.24.0
-   asyncio: mode=Mode.STRICT, default_loop_scope=None
+   plugins: asyncio-0.14.0, cov-2.10.0
    collected 2 items
 
    monitoringdaemon/tests.py ..                                    [100%]
 
-   ---------- coverage: platform linux, python 3.10.0-final-0 -----------
+   ----------- coverage: platform linux, python 3.8.3-final-0 -----------
    Name                             Stmts   Miss  Cover
    ----------------------------------------------------
    monitoringdaemon/__init__.py         0      0   100%
-   monitoringdaemon/__main__.py        11     11     0%
+   monitoringdaemon/__main__.py        13     13     0%
    monitoringdaemon/containers.py      11      0   100%
-   monitoringdaemon/dispatcher.py      45      5    89%
+   monitoringdaemon/dispatcher.py      44      5    89%
    monitoringdaemon/http.py             6      3    50%
    monitoringdaemon/monitors.py        23      1    96%
-   monitoringdaemon/tests.py           35      0   100%
+   monitoringdaemon/tests.py           37      0   100%
    ----------------------------------------------------
-   TOTAL                              131     20    85%
+   TOTAL                              134     22    84%
 
 .. note::
 
@@ -1026,6 +1039,4 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/tutorials/cli.rst

@@ -160,19 +160,19 @@ Second put next in the ``fixtures.py``:
 
 
    SAMPLE_DATA = [
-       ("The Hunger Games: Mockingjay - Part 2", 2015, "Francis Lawrence"),
-       ("Rogue One: A Star Wars Story", 2016, "Gareth Edwards"),
-       ("The Jungle Book", 2016, "Jon Favreau"),
+       ('The Hunger Games: Mockingjay - Part 2', 2015, 'Francis Lawrence'),
+       ('Rogue One: A Star Wars Story', 2016, 'Gareth Edwards'),
+       ('The Jungle Book', 2016, 'Jon Favreau'),
    ]
 
    FILE = pathlib.Path(__file__)
    DIR = FILE.parent
-   CSV_FILE = DIR / "movies.csv"
-   SQLITE_FILE = DIR / "movies.db"
+   CSV_FILE = DIR / 'movies.csv'
+   SQLITE_FILE = DIR / 'movies.db'
 
 
    def create_csv(movies_data, path):
-       with open(path, "w") as opened_file:
+       with open(path, 'w') as opened_file:
            writer = csv.writer(opened_file)
            for row in movies_data:
                writer.writerow(row)
@@ -181,20 +181,20 @@ Second put next in the ``fixtures.py``:
    def create_sqlite(movies_data, path):
        with sqlite3.connect(path) as db:
            db.execute(
-               "CREATE TABLE IF NOT EXISTS movies "
-               "(title text, year int, director text)"
+               'CREATE TABLE IF NOT EXISTS movies '
+               '(title text, year int, director text)'
            )
-           db.execute("DELETE FROM movies")
-           db.executemany("INSERT INTO movies VALUES (?,?,?)", movies_data)
+           db.execute('DELETE FROM movies')
+           db.executemany('INSERT INTO movies VALUES (?,?,?)', movies_data)
 
 
    def main():
        create_csv(SAMPLE_DATA, CSV_FILE)
        create_sqlite(SAMPLE_DATA, SQLITE_FILE)
-       print("OK")
+       print('OK')
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        main()
 
 Now run in the terminal:
@@ -266,7 +266,7 @@ Edit ``__main__.py``:
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
 
        main()
@@ -321,7 +321,7 @@ and put next into it:
            self.director = str(director)
 
        def __repr__(self):
-           return "{0}(title={1}, year={2}, director={3})".format(
+           return '{0}(title={1}, year={2}, director={3})'.format(
                self.__class__.__name__,
                repr(self.title),
                repr(self.year),
@@ -428,7 +428,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        movie = providers.Factory(entities.Movie)
 
@@ -445,9 +445,15 @@ This is also called the delegation of the provider. If we just pass the movie fa
 as the dependency, it will be called when csv finder is created and the ``Movie`` instance will
 be injected. With the ``.provider`` attribute the provider itself will be injected.
 
-The csv finder also has a few dependencies on the configuration options. We added a configuration
-provider to provide these dependencies and specified the location of the configuration file.
-The configuration provider will parse the configuration file when we create a container instance.
+The csv finder also has a few dependencies on the configuration options. We added configuration
+provider to provide these dependencies.
+
+.. note::
+
+   We have used the configuration value before it was defined. That's the principle how the
+   Configuration provider works.
+
+   Use first, define later.
 
 Not let's define the configuration values.
 
@@ -461,7 +467,29 @@ Edit ``config.yml``:
        path: "data/movies.csv"
        delimiter: ","
 
-The configuration file is ready. Move on to the lister.
+The configuration file is ready. Now let's update the  ``main()`` function to specify its location.
+
+Edit ``__main__.py``:
+
+.. code-block:: python
+   :emphasize-lines: 12
+
+   """Main module."""
+
+   from .containers import Container
+
+
+   def main() -> None:
+       ...
+
+
+   if __name__ == '__main__':
+       container = Container()
+       container.config.from_yaml('config.yml')
+
+       main()
+
+Move on to the lister.
 
 Create the ``listers.py`` in the ``movies`` package:
 
@@ -524,7 +552,7 @@ and edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        movie = providers.Factory(entities.Movie)
 
@@ -547,11 +575,13 @@ Let's inject the ``lister`` into the  ``main()`` function.
 Edit ``__main__.py``:
 
 .. code-block:: python
-   :emphasize-lines: 3-5,9-10,16
+   :emphasize-lines: 3-7,11-12,19
 
    """Main module."""
 
-   from dependency_injector.wiring import Provide, inject
+   import sys
+
+   from dependency_injector.wiring import inject, Provide
 
    from .listers import MovieLister
    from .containers import Container
@@ -562,9 +592,10 @@ Edit ``__main__.py``:
        ...
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
-       container.wire(modules=[__name__])
+       container.config.from_yaml('config.yml')
+       container.wire(modules=[sys.modules[__name__]])
 
        main()
 
@@ -576,11 +607,13 @@ Francis Lawrence and movies released in 2016.
 Edit ``__main__.py``:
 
 .. code-block:: python
-   :emphasize-lines: 11-17
+   :emphasize-lines: 13-19
 
    """Main module."""
 
-   from dependency_injector.wiring import Provide, inject
+   import sys
+
+   from dependency_injector.wiring import inject, Provide
 
    from .listers import MovieLister
    from .containers import Container
@@ -588,18 +621,19 @@ Edit ``__main__.py``:
 
    @inject
    def main(lister: MovieLister = Provide[Container.lister]) -> None:
-       print("Francis Lawrence movies:")
-       for movie in lister.movies_directed_by("Francis Lawrence"):
-           print("\t-", movie)
+       print('Francis Lawrence movies:')
+       for movie in lister.movies_directed_by('Francis Lawrence'):
+           print('\t-', movie)
 
-       print("2016 movies:")
+       print('2016 movies:')
        for movie in lister.movies_released_in(2016):
-           print("\t-", movie)
+           print('\t-', movie)
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
-       container.wire(modules=[__name__])
+       container.config.from_yaml('config.yml')
+       container.wire(modules=[sys.modules[__name__]])
 
        main()
 
@@ -684,7 +718,7 @@ Edit ``finders.py``:
 
        def find_all(self) -> List[Movie]:
            with self._database as db:
-               rows = db.execute("SELECT title, year, director FROM movies")
+               rows = db.execute('SELECT title, year, director FROM movies')
                return [self._movie_factory(*row) for row in rows]
 
 Now we need to add the sqlite finder to the container and update lister's dependency to use it.
@@ -703,7 +737,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        movie = providers.Factory(entities.Movie)
 
@@ -792,7 +826,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        movie = providers.Factory(entities.Movie)
 
@@ -829,11 +863,13 @@ Now we need to read the value of the ``config.finder.type`` option from the envi
 Edit ``__main__.py``:
 
 .. code-block:: python
-   :emphasize-lines: 22
+   :emphasize-lines: 25
 
    """Main module."""
 
-   from dependency_injector.wiring import Provide, inject
+   import sys
+
+   from dependency_injector.wiring import inject, Provide
 
    from .listers import MovieLister
    from .containers import Container
@@ -841,18 +877,19 @@ Edit ``__main__.py``:
 
    @inject
    def main(lister: MovieLister = Provide[Container.lister]) -> None:
-       print("Francis Lawrence movies:")
-       for movie in lister.movies_directed_by("Francis Lawrence"):
-           print("\t-", movie)
+       print('Francis Lawrence movies:')
+       for movie in lister.movies_directed_by('Francis Lawrence'):
+           print('\t-', movie)
 
-       print("2016 movies:")
+       print('2016 movies:')
        for movie in lister.movies_released_in(2016):
-           print("\t-", movie)
+           print('\t-', movie)
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
-       container.config.finder.type.from_env("MOVIE_FINDER_TYPE")
+       container.config.from_yaml('config.yml')
+       container.config.finder.type.from_env('MOVIE_FINDER_TYPE')
        container.wire(modules=[sys.modules[__name__]])
 
        main()
@@ -911,7 +948,7 @@ Create ``tests.py`` in the ``movies`` package:
 and put next into it:
 
 .. code-block:: python
-   :emphasize-lines: 41,50
+   :emphasize-lines: 35,50
 
    """Tests module."""
 
@@ -924,50 +961,50 @@ and put next into it:
 
    @pytest.fixture
    def container():
-       container = Container(
-           config={
-               "finder": {
-                   "type": "csv",
-                   "csv": {
-                       "path": "/fake-movies.csv",
-                       "delimiter": ",",
-                   },
-                   "sqlite": {
-                       "path": "/fake-movies.db",
-                   },
+       container = Container()
+       container.config.from_dict({
+           'finder': {
+               'type': 'csv',
+               'csv': {
+                   'path': '/fake-movies.csv',
+                   'delimiter': ',',
+               },
+               'sqlite': {
+                   'path': '/fake-movies.db',
                },
            },
-       )
+       })
        return container
 
 
-   @pytest.fixture
-   def finder_mock(container):
+   def test_movies_directed_by(container):
        finder_mock = mock.Mock()
        finder_mock.find_all.return_value = [
-           container.movie("The 33", 2015, "Patricia Riggen"),
-           container.movie("The Jungle Book", 2016, "Jon Favreau"),
+           container.movie('The 33', 2015, 'Patricia Riggen'),
+           container.movie('The Jungle Book', 2016, 'Jon Favreau'),
        ]
 
-       return finder_mock
-
-
-   def test_movies_directed_by(container, finder_mock):
        with container.finder.override(finder_mock):
            lister = container.lister()
-           movies = lister.movies_directed_by("Jon Favreau")
+           movies = lister.movies_directed_by('Jon Favreau')
 
        assert len(movies) == 1
-       assert movies[0].title == "The Jungle Book"
+       assert movies[0].title == 'The Jungle Book'
 
 
-   def test_movies_released_in(container, finder_mock):
+   def test_movies_released_in(container):
+       finder_mock = mock.Mock()
+       finder_mock.find_all.return_value = [
+           container.movie('The 33', 2015, 'Patricia Riggen'),
+           container.movie('The Jungle Book', 2016, 'Jon Favreau'),
+       ]
+
        with container.finder.override(finder_mock):
            lister = container.lister()
            movies = lister.movies_released_in(2015)
 
        assert len(movies) == 1
-       assert movies[0].title == "The 33"
+       assert movies[0].title == 'The 33'
 
 Run in the terminal:
 
@@ -979,24 +1016,24 @@ You should see:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
-   plugins: cov-3.0.0
+   platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1
+   plugins: cov-2.10.0
    collected 2 items
 
    movies/tests.py ..                                              [100%]
 
-   ---------- coverage: platform darwin, python 3.10 -----------
+   ---------- coverage: platform darwin, python 3.8.5-final-0 -----------
    Name                   Stmts   Miss  Cover
    ------------------------------------------
    movies/__init__.py         0      0   100%
-   movies/__main__.py        16     16     0%
+   movies/__main__.py        18     18     0%
    movies/containers.py       9      0   100%
    movies/entities.py         7      1    86%
    movies/finders.py         26     13    50%
    movies/listers.py          8      0   100%
    movies/tests.py           24      0   100%
    ------------------------------------------
-   TOTAL                     90     30    67%
+   TOTAL                     92     32    65%
 
 .. note::
 
@@ -1016,7 +1053,7 @@ We've used the ``Dependency Injector`` as a dependency injection framework.
 With a help of :ref:`containers` and :ref:`providers` we have defined how to assemble application components.
 
 ``Selector`` provider served as a switch for selecting the database format based on a configuration.
-:ref:`configuration-provider` helped to deal with reading a YAML file and environment variables.
+:ref:`configuration-provider` helped to deal with reading YAML file and environment variable.
 
 We used :ref:`wiring` feature to inject the dependencies into the ``main()`` function.
 :ref:`provider-overriding` feature helped in testing.
@@ -1033,6 +1070,4 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
-.. include:: ../sponsor.rst
-
 .. disqus::

docs/tutorials/flask.rst

@@ -110,9 +110,9 @@ You should see something like:
 .. code-block:: bash
 
    (venv) $ python -c "import dependency_injector; print(dependency_injector.__version__)"
-   4.37.0
+   4.0.0
    (venv) $ python -c "import flask; print(flask.__version__)"
-   2.0.2
+   1.1.2
 
 *Versions can be different. That's fine.*
 
@@ -129,7 +129,7 @@ Put next into the ``views.py``:
 
 
    def index():
-       return "Hello, World!"
+       return 'Hello, World!'
 
 Ok, we have the view.
 
@@ -170,7 +170,7 @@ Put next into the ``application.py``:
 
        app = Flask(__name__)
        app.container = container
-       app.add_url_rule("/", "index", views.index)
+       app.add_url_rule('/', 'index', views.index)
 
        return app
 
@@ -246,7 +246,7 @@ Edit ``application.py``:
 
        app = Flask(__name__)
        app.container = container
-       app.add_url_rule("/", "index", views.index)
+       app.add_url_rule('/', 'index', views.index)
 
        bootstrap = Bootstrap()
        bootstrap.init_app(app)
@@ -398,13 +398,13 @@ Edit ``views.py``:
 
 
    def index():
-       query = request.args.get("query", "Dependency Injector")
-       limit = request.args.get("limit", 10, int)
+       query = request.args.get('query', 'Dependency Injector')
+       limit = request.args.get('limit', 10, int)
 
        repositories = []
 
        return render_template(
-           "index.html",
+           'index.html',
            query=query,
            limit=limit,
            repositories=repositories,
@@ -444,10 +444,9 @@ and run in the terminal:
 Now we need to add Github API client the container. We will need to add two more providers from
 the ``dependency_injector.providers`` module:
 
-- ``Factory`` provider. It will create a ``Github`` client.
-- ``Configuration`` provider. It will provide an API token and a request timeout for the ``Github`` client.
-  We will specify the location of the configuration file. The configuration provider will parse
-  the configuration file when we create a container instance.
+- ``Factory`` provider that will create ``Github`` client.
+- ``Configuration`` provider that will be used for providing the API token and the request timeout
+  for the ``Github`` client.
 
 Edit ``containers.py``:
 
@@ -462,7 +461,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        github_client = providers.Factory(
            Github,
@@ -470,14 +469,23 @@ Edit ``containers.py``:
            timeout=config.github.request_timeout,
        )
 
+.. note::
+
+   We have used the configuration value before it was defined. That's the principle how
+   ``Configuration`` provider works.
+
+   Use first, define later.
 
 .. note::
 
    Don't forget to remove the Ellipsis ``...`` from the container. We don't need it anymore
    since we container is not empty.
 
-Now let's add the configuration file. We will use YAML. Create an empty file ``config.yml``
-in the root of the project:
+Now let's add the configuration file.
+
+We will use YAML.
+
+Create an empty file ``config.yml`` in the root of the project:
 
 .. code-block:: bash
    :emphasize-lines: 11
@@ -522,13 +530,17 @@ and install it:
 
    pip install -r requirements.txt
 
-We will use the ``GITHUB_TOKEN`` environment variable to provide the API token. Let's edit
-``create_app()`` to fetch the token value from it.
+We will use environment variable ``GITHUB_TOKEN`` to provide the API token.
+
+Now we need to edit ``create_app()`` to make two things when application starts:
+
+- Load the configuration file the ``config.yml``.
+- Load the API token from the ``GITHUB_TOKEN`` environment variable.
 
 Edit ``application.py``:
 
 .. code-block:: python
-   :emphasize-lines: 12
+   :emphasize-lines: 12-13
 
    """Application module."""
 
@@ -541,11 +553,12 @@ Edit ``application.py``:
 
    def create_app() -> Flask:
        container = Container()
-       container.config.github.auth_token.from_env("GITHUB_TOKEN")
+       container.config.from_yaml('config.yml')
+       container.config.github.auth_token.from_env('GITHUB_TOKEN')
 
        app = Flask(__name__)
        app.container = container
-       app.add_url_rule("/", "index", views.index)
+       app.add_url_rule('/', 'index', views.index)
 
        bootstrap = Bootstrap()
        bootstrap.init_app(app)
@@ -626,7 +639,7 @@ and put next into it:
            """Search for repositories and return formatted data."""
            repositories = self._github_client.search_repositories(
                query=query,
-               **{"in": "name"},
+               **{'in': 'name'},
            )
            return [
                self._format_repo(repository)
@@ -636,22 +649,22 @@ and put next into it:
        def _format_repo(self, repository: Repository):
            commits = repository.get_commits()
            return {
-               "url": repository.html_url,
-               "name": repository.name,
-               "owner": {
-                   "login": repository.owner.login,
-                   "url": repository.owner.html_url,
-                   "avatar_url": repository.owner.avatar_url,
+               'url': repository.html_url,
+               'name': repository.name,
+               'owner': {
+                   'login': repository.owner.login,
+                   'url': repository.owner.html_url,
+                   'avatar_url': repository.owner.avatar_url,
                },
-               "latest_commit": self._format_commit(commits[0]) if commits else {},
+               'latest_commit': self._format_commit(commits[0]) if commits else {},
            }
 
        def _format_commit(self, commit: Commit):
            return {
-               "sha": commit.sha,
-               "url": commit.html_url,
-               "message": commit.commit.message,
-               "author_name": commit.commit.author.name,
+               'sha': commit.sha,
+               'url': commit.html_url,
+               'message': commit.commit.message,
+               'author_name': commit.commit.author.name,
            }
 
 Now let's add ``SearchService`` to the container.
@@ -671,7 +684,7 @@ Edit ``containers.py``:
 
    class Container(containers.DeclarativeContainer):
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       config = providers.Configuration()
 
        github_client = providers.Factory(
            Github,
@@ -707,51 +720,50 @@ Edit ``views.py``:
 
    @inject
    def index(search_service: SearchService = Provide[Container.search_service]):
-       query = request.args.get("query", "Dependency Injector")
-       limit = request.args.get("limit", 10, int)
+       query = request.args.get('query', 'Dependency Injector')
+       limit = request.args.get('limit', 10, int)
 
        repositories = search_service.search_repositories(query, limit)
 
        return render_template(
-           "index.html",
+           'index.html',
            query=query,
            limit=limit,
            repositories=repositories,
        )
 
-To make the injection work we need to wire the container with the ``views`` module.
-Let's configure the container to automatically make wiring with the ``views`` module when we
-create a container instance.
+To make the injection work we need to wire the container instance with the ``views`` module.
+This needs to be done once. After it's done we can use ``Provide`` markers to specify as many
+injections as needed for any view.
 
-Edit ``containers.py``:
+Edit ``application.py``:
 
 .. code-block:: python
-   :emphasize-lines: 11
+   :emphasize-lines: 14
 
-   """Containers module."""
+   """Application module."""
 
-   from dependency_injector import containers, providers
-   from github import Github
+   from flask import Flask
+   from flask_bootstrap import Bootstrap
 
-   from . import services
+   from .containers import Container
+   from . import views
 
 
-   class Container(containers.DeclarativeContainer):
+   def create_app() -> Flask:
+       container = Container()
+       container.config.from_yaml('config.yml')
+       container.config.github.auth_token.from_env('GITHUB_TOKEN')
+       container.wire(modules=[views])
 
-       wiring_config = containers.WiringConfiguration(modules=[".views"])
+       app = Flask(__name__)
+       app.container = container
+       app.add_url_rule('/', 'index', views.index)
 
-       config = providers.Configuration(yaml_files=["config.yml"])
+       bootstrap = Bootstrap()
+       bootstrap.init_app(app)
 
-       github_client = providers.Factory(
-           Github,
-           login_or_token=config.github.auth_token,
-           timeout=config.github.request_timeout,
-       )
-
-       search_service = providers.Factory(
-           services.SearchService,
-           github_client=github_client,
-       )
+       return app
 
 Make sure the app is running or use ``flask run`` and open ``http://127.0.0.1:5000/``.
 
@@ -789,13 +801,13 @@ Edit ``views.py``:
            default_query: str = Provide[Container.config.default.query],
            default_limit: int = Provide[Container.config.default.limit.as_int()],
    ):
-       query = request.args.get("query", default_query)
-       limit = request.args.get("limit", default_limit, int)
+       query = request.args.get('query', default_query)
+       limit = request.args.get('limit', default_limit, int)
 
        repositories = search_service.search_repositories(query, limit)
 
        return render_template(
-           "index.html",
+           'index.html',
            query=query,
            limit=limit,
            repositories=repositories,
@@ -888,44 +900,44 @@ and put next into it:
        github_client_mock = mock.Mock(spec=Github)
        github_client_mock.search_repositories.return_value = [
            mock.Mock(
-               html_url="repo1-url",
-               name="repo1-name",
+               html_url='repo1-url',
+               name='repo1-name',
                owner=mock.Mock(
-                   login="owner1-login",
-                   html_url="owner1-url",
-                   avatar_url="owner1-avatar-url",
+                   login='owner1-login',
+                   html_url='owner1-url',
+                   avatar_url='owner1-avatar-url',
                ),
                get_commits=mock.Mock(return_value=[mock.Mock()]),
            ),
            mock.Mock(
-               html_url="repo2-url",
-               name="repo2-name",
+               html_url='repo2-url',
+               name='repo2-name',
                owner=mock.Mock(
-                   login="owner2-login",
-                   html_url="owner2-url",
-                   avatar_url="owner2-avatar-url",
+                   login='owner2-login',
+                   html_url='owner2-url',
+                   avatar_url='owner2-avatar-url',
                ),
                get_commits=mock.Mock(return_value=[mock.Mock()]),
            ),
        ]
 
        with app.container.github_client.override(github_client_mock):
-           response = client.get(url_for("index"))
+           response = client.get(url_for('index'))
 
        assert response.status_code == 200
-       assert b"Results found: 2" in response.data
+       assert b'Results found: 2' in response.data
 
-       assert b"repo1-url" in response.data
-       assert b"repo1-name" in response.data
-       assert b"owner1-login" in response.data
-       assert b"owner1-url" in response.data
-       assert b"owner1-avatar-url" in response.data
+       assert b'repo1-url' in response.data
+       assert b'repo1-name' in response.data
+       assert b'owner1-login' in response.data
+       assert b'owner1-url' in response.data
+       assert b'owner1-avatar-url' in response.data
 
-       assert b"repo2-url" in response.data
-       assert b"repo2-name" in response.data
-       assert b"owner2-login" in response.data
-       assert b"owner2-url" in response.data
-       assert b"owner2-avatar-url" in response.data
+       assert b'repo2-url' in response.data
+       assert b'repo2-name' in response.data
+       assert b'owner2-login' in response.data
+       assert b'owner2-url' in response.data
+       assert b'owner2-avatar-url' in response.data
 
 
    def test_index_no_results(client, app):
@@ -933,10 +945,10 @@ and put next into it:
        github_client_mock.search_repositories.return_value = []
 
        with app.container.github_client.override(github_client_mock):
-           response = client.get(url_for("index"))
+           response = client.get(url_for('index'))
 
        assert response.status_code == 200
-       assert b"Results found: 0" in response.data
+       assert b'Results found: 0' in response.data
 
 Now let's run it and check the coverage:
 
@@ -948,23 +960,23 @@ You should see:
 
 .. code-block:: bash
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
-   plugins: cov-3.0.0, flask-1.2.0
+   platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1
+   plugins: flask-1.0.0, cov-2.10.0
    collected 2 items
 
    githubnavigator/tests.py ..                                     [100%]
 
-   ---------- coverage: platform darwin, python 3.10.0-final-0 ----------
+   ---------- coverage: platform darwin, python 3.8.3-final-0 -----------
    Name                             Stmts   Miss  Cover
    ----------------------------------------------------
    githubnavigator/__init__.py          0      0   100%
-   githubnavigator/application.py      13      0   100%
-   githubnavigator/containers.py        8      0   100%
+   githubnavigator/application.py      15      0   100%
+   githubnavigator/containers.py        7      0   100%
    githubnavigator/services.py         14      0   100%
    githubnavigator/tests.py            34      0   100%
    githubnavigator/views.py            10      0   100%
    ----------------------------------------------------
-   TOTAL                               79      0   100%
+   TOTAL                               80      0   100%
 
 .. note::
 
@@ -998,6 +1010,5 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
-.. include:: ../sponsor.rst
 
 .. disqus::

docs/wiring.rst

@@ -22,82 +22,6 @@ To use wiring you need:
    :local:
    :backlinks: none
 
-Decorator @inject
------------------
-
-Decorator ``@inject`` injects the dependencies. Use it to decorate all functions and methods
-with the injections.
-
-.. code-block:: python
-
-   from dependency_injector.wiring import inject, Provide
-
-
-   @inject
-   def foo(bar: Bar = Provide[Container.bar]):
-       ...
-
-Decorator ``@inject`` must be specified as a very first decorator of a function to ensure that
-the wiring works appropriately. This will also contribute to the performance of the wiring process.
-
-.. code-block:: python
-
-   from dependency_injector.wiring import inject, Provide
-
-
-   @decorator_etc
-   @decorator_2
-   @decorator_1
-   @inject
-   def foo(bar: Bar = Provide[Container.bar]):
-       ...
-
-Specifying the ``@inject`` as a first decorator is also crucial for FastAPI, other frameworks
-using decorators similarly, for closures, and for any types of custom decorators with the injections.
-
-FastAPI example:
-
-.. code-block:: python
-
-   app = FastAPI()
-
-
-   @app.api_route("/")
-   @inject
-   async def index(service: Annotated[Service, Depends(Provide[Container.service])]):
-       value = await service.process()
-       return {"result": value}
-
-Decorators example:
-
-.. code-block:: python
-
-   def decorator1(func):
-       @functools.wraps(func)
-       @inject
-       def wrapper(value1: int = Provide[Container.config.value1]):
-           result = func()
-           return result + value1
-       return wrapper
-
-
-   def decorator2(func):
-       @functools.wraps(func)
-       @inject
-       def wrapper(value2: int = Provide[Container.config.value2]):
-           result = func()
-           return result + value2
-       return wrapper
-
-   @decorator1
-   @decorator2
-   def sample():
-       ...
-
-.. seealso::
-   `Issue #404 <https://github.com/ets-labs/python-dependency-injector/issues/404#issuecomment-785216978>`_
-   explains ``@inject`` decorator in a few more details.
-
 Markers
 -------
 
@@ -115,29 +39,19 @@ a function or method argument:
 
 Specifying an annotation is optional.
 
-To inject the provider itself use ``Provide[foo.provider]``:
+There are two types of markers:
+
+- ``Provide[foo]`` - call the provider ``foo`` and injects the result
+- ``Provider[foo]`` - injects the provider ``foo`` itself
 
 .. code-block:: python
 
-   from dependency_injector.providers import Factory
-   from dependency_injector.wiring import inject, Provide
-
-
-   @inject
-   def foo(bar_provider: Factory[Bar] = Provide[Container.bar.provider]):
-       bar = bar_provider(argument="baz")
-       ...
-You can also use ``Provider[foo]`` for injecting the provider itself:
-
-.. code-block:: python
-
-   from dependency_injector.providers import Factory
    from dependency_injector.wiring import inject, Provider
 
 
    @inject
-   def foo(bar_provider: Factory[Bar] = Provider[Container.bar]):
-       bar = bar_provider(argument="baz")
+   def foo(bar_provider: Callable[..., Bar] = Provider[Container.bar]):
+       bar = bar_provider()
        ...
 
 You can use configuration, provided instance and sub-container providers as you normally do.
@@ -171,17 +85,17 @@ Also you can use ``Provide`` marker to inject a container.
 
 .. literalinclude:: ../examples/wiring/example_container.py
    :language: python
-   :emphasize-lines: 14-17
+   :emphasize-lines: 16-19
    :lines: 3-
 
-String identifiers
-------------------
+Strings identifiers
+-------------------
 
 You can use wiring with string identifiers. String identifier should match provider name in the container:
 
 .. literalinclude:: ../examples/wiring/example_string_id.py
    :language: python
-   :emphasize-lines: 15
+   :emphasize-lines: 17
    :lines: 3-
 
 With string identifiers you don't need to use a container to specify an injection.
@@ -191,7 +105,7 @@ To specify an injection from a nested container use point ``.`` as a separator:
 .. code-block:: python
 
    @inject
-   def foo(service: UserService = Provide["services.user"]) -> None:
+   def foo(service: UserService = Provide['services.user']) -> None:
        ...
 
 You can also use injection modifiers:
@@ -211,34 +125,34 @@ You can also use injection modifiers:
 
 
    @inject
-   def foo(value: int = Provide["config.option", as_int()]) -> None:
+   def foo(value: int = Provide['config.option', as_int()]) -> None:
        ...
 
 
    @inject
-   def foo(value: float = Provide["config.option", as_float()]) -> None:
+   def foo(value: float = Provide['config.option', as_float()]) -> None:
        ...
 
 
    @inject
-   def foo(value: Decimal = Provide["config.option", as_(Decimal)]) -> None:
+   def foo(value: Decimal = Provide['config.option', as_(Decimal)]) -> None:
        ...
 
    @inject
-   def foo(value: str = Provide["config.option", required()]) -> None:
+   def foo(value: str = Provide['config.option', required()]) -> None:
        ...
 
    @inject
-   def foo(value: int = Provide["config.option", required().as_int()]) -> None:
+   def foo(value: int = Provide['config.option', required().as_int()]) -> None:
        ...
 
 
    @inject
-   def foo(value: int = Provide["config.option", invariant("config.switch")]) -> None:
+   def foo(value: int = Provide['config.option', invariant('config.switch')]) -> None:
        ...
 
    @inject
-   def foo(value: int = Provide["service", provided().foo["bar"].call()]) -> None:
+   def foo(value: int = Provide['service', provided().foo['bar'].call()]) -> None:
        ...
 
 
@@ -247,7 +161,7 @@ To inject a container use special identifier ``<container>``:
 .. code-block:: python
 
    @inject
-   def foo(container: Container = Provide["<container>"]) -> None:
+   def foo(container: Container = Provide['<container>']) -> None:
        ...
 
 
@@ -259,63 +173,25 @@ You can use wiring to make injections into modules and class attributes.
 .. literalinclude:: ../examples/wiring/example_attribute.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 14,19
+   :emphasize-lines: 16,21
 
 You could also use string identifiers to avoid a dependency on a container:
 
 .. code-block:: python
    :emphasize-lines: 1,6
 
-   service: Service = Provide["service"]
+   service: Service = Provide['service']
 
 
    class Main:
 
-       service: Service = Provide["service"]
+       service: Service = Provide['service']
 
 Wiring with modules and packages
 --------------------------------
 
-To wire a container with the modules you need to call ``container.wire()`` method:
-
-.. code-block:: python
-
-   container.wire(
-       modules=[
-           "yourapp.module1",
-           "yourapp.module2",
-       ],
-   )
-
-Method ``container.wire()`` can resolve relative imports:
-
-.. code-block:: python
-
-   # In module "yourapp.main":
-
-   container.wire(
-       modules=[
-           ".module1",  # Resolved to: "yourapp.module1"
-           ".module2",  # Resolved to: "yourapp.module2"
-       ],
-   )
-
-You can also manually specify a base package for resolving relative imports with
-the ``from_package`` argument:
-
-.. code-block:: python
-
-   # In module "yourapp.main":
-
-   container.wire(
-       modules=[
-           ".module1",  # Resolved to: "anotherapp.module1"
-           ".module2",  # Resolved to: "anotherapp.module2"
-       ],
-       from_package="anotherapp",
-   )
-
-Argument ``modules`` can also take already imported modules:
+To wire a container with a module you need to call ``container.wire(modules=[...])`` method. Argument
+``modules`` is an iterable of the module objects.
 
 .. code-block:: python
 
@@ -325,16 +201,15 @@ Argument ``modules`` can also take already imported modules:
    container = Container()
    container.wire(modules=[module1, module2])
 
-You can wire container with a package. Container walks recursively over the package modules:
+You can wire container with a package. Container walks recursively over package modules.
 
 .. code-block:: python
 
-   container.wire(
-       packages=[
-           "yourapp.package1",
-           "yourapp.package2",
-       ],
-   )
+   from yourapp import package1, package2
+
+
+   container = Container()
+   container.wire(packages=[package1, package2])
 
 Arguments ``modules`` and ``packages`` can be used together.
 
@@ -348,7 +223,7 @@ When wiring is done functions and methods with the markers are patched to provid
 
 
    container = Container()
-   container.wire(modules=[__name__])
+   container.wire(modules=[sys.modules[__name__]])
 
    foo()  # <--- Argument "bar" is injected
 
@@ -382,7 +257,7 @@ You can use that in testing to re-create and re-wire a container before each tes
 
        def setUp(self):
            self.container = Container()
-           self.container.wire(modules=["yourapp.module1", "yourapp.module2"])
+           self.container.wire(modules=[module1, module2])
            self.addCleanup(self.container.unwire)
 
 .. code-block:: python
@@ -393,7 +268,7 @@ You can use that in testing to re-create and re-wire a container before each tes
    @pytest.fixture
    def container():
        container = Container()
-       container.wire(modules=["yourapp.module1", "yourapp.module2"])
+       container.wire(modules=[module1, module2])
        yield container
        container.unwire()
 
@@ -424,76 +299,6 @@ You can use that in testing to re-create and re-wire a container before each tes
 
       module.fn()
 
-Wiring configuration
---------------------
-
-You can specify wiring configuration in the container. When wiring configuration is defined,
-container will call method ``.wire()`` automatically when you create an instance:
-
-.. code-block:: python
-
-   class Container(containers.DeclarativeContainer):
-
-       wiring_config = containers.WiringConfiguration(
-           modules=[
-               "yourapp.module1",
-               "yourapp.module2",
-           ],
-           packages=[
-               "yourapp.package1",
-               "yourapp.package2",
-           ],
-       )
-
-       ...
-
-
-   if __name__ == "__main__":
-       container = Container()  # container.wire() is called automatically
-       ...
-
-You can also use relative imports. Container will resolve them corresponding
-to the module of the container class:
-
-.. code-block:: python
-
-   # In module "yourapp.container":
-
-   class Container(containers.DeclarativeContainer):
-
-       wiring_config = containers.WiringConfiguration(
-           modules=[
-              ".module1",  # Resolved to: "yourapp.module1"
-              ".module2",  # Resolved to: "yourapp.module2"
-           ],
-       )
-   )
-
-
-   # In module "yourapp.foo.bar.main":
-
-   if __name__ == "__main__":
-       container = Container()  # wire to "yourapp.module1" and "yourapp.module2"
-       ...
-
-To use wiring configuration and call method ``.wire()`` manually, set flag ``auto_wire=False``:
-
-.. code-block:: python
-   :emphasize-lines: 5
-
-   class Container(containers.DeclarativeContainer):
-
-       wiring_config = containers.WiringConfiguration(
-           modules=["yourapp.module1"],
-           auto_wire=False,
-       )
-
-
-   if __name__ == "__main__":
-       container = Container()  # container.wire() is NOT called automatically
-       container.wire()         # wire to "yourapp.module1"
-       ...
-
 .. _async-injections-wiring:
 
 Asynchronous injections
@@ -587,11 +392,11 @@ This is useful when you import modules dynamically.
    from .containers import Container
 
 
-   if __name__ == "__main__":
+   if __name__ == '__main__':
        container = Container()
        register_loader_containers(container)  # <--- installs import hook
 
-       module = importlib.import_module("package.module")
+       module = importlib.import_module('package.module')
        module.foo()
 
 You can register multiple containers in the import hook. For doing this call register function

examples/containers/check_dependencies.py

@@ -9,7 +9,7 @@ class Container(containers.DeclarativeContainer):
     service2 = providers.Dependency()
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
     container.check_dependencies()  # <-- raises error:
     # Container has undefined dependencies: "Container.service1", "Container.service2"

examples/containers/declarative.py

@@ -10,7 +10,7 @@ class Container(containers.DeclarativeContainer):
     factory2 = providers.Factory(object)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     object1 = container.factory1()
@@ -18,6 +18,6 @@ if __name__ == "__main__":
 
     print(container.providers)
     # {
-    #     "factory1": <dependency_injector.providers.Factory(...),
-    #     "factory2": <dependency_injector.providers.Factory(...),
+    #     'factory1': <dependency_injector.providers.Factory(...),
+    #     'factory2': <dependency_injector.providers.Factory(...),
     # }

examples/containers/declarative_copy_decorator1.py

@@ -13,7 +13,7 @@ class Service:
 
 class SourceContainer(containers.DeclarativeContainer):
 
-    database = providers.Singleton(sqlite3.connect, ":memory:")
+    database = providers.Singleton(sqlite3.connect, ':memory:')
     service = providers.Factory(Service, db=database)
 
 
@@ -24,7 +24,7 @@ class DestinationContainer(SourceContainer):
     database = providers.Singleton(mock.Mock)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = DestinationContainer()
 
     service = container.service()

examples/containers/declarative_copy_decorator2.py

@@ -9,21 +9,21 @@ class Service:
 
 
 class Base(containers.DeclarativeContainer):
-    dependency = providers.Dependency(instance_of=str, default="Default value")
+    dependency = providers.Dependency(instance_of=str, default='Default value')
     service = providers.Factory(Service, dependency=dependency)
 
 
 @containers.copy(Base)
 class Derived1(Base):
-    dependency = providers.Dependency(instance_of=str, default="Derived 1")
+    dependency = providers.Dependency(instance_of=str, default='Derived 1')
 
 
 # @containers.copy(Base)  # <-- No @copy decorator
 class Derived2(Base):
-    dependency = providers.Dependency(instance_of=str, default="Derived 2")
+    dependency = providers.Dependency(instance_of=str, default='Derived 2')
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container1 = Derived1()
     service1 = container1.service()
     print(service1.dependency)  # Derived 1

examples/containers/declarative_inheritance.py

@@ -14,21 +14,21 @@ class ContainerB(ContainerA):
 
 
 assert ContainerA.providers == {
-    "provider1": ContainerA.provider1,
+    'provider1': ContainerA.provider1,
 }
 assert ContainerB.providers == {
-    "provider1": ContainerA.provider1,
-    "provider2": ContainerB.provider2,
+    'provider1': ContainerA.provider1,
+    'provider2': ContainerB.provider2,
 }
 
 assert ContainerA.cls_providers == {
-    "provider1": ContainerA.provider1,
+    'provider1': ContainerA.provider1,
 }
 assert ContainerB.cls_providers == {
-    "provider2": ContainerB.provider2,
+    'provider2': ContainerB.provider2,
 }
 
 assert ContainerA.inherited_providers == {}
 assert ContainerB.inherited_providers == {
-    "provider1": ContainerA.provider1,
+    'provider1': ContainerA.provider1,
 }

examples/containers/declarative_injections.py

@@ -18,7 +18,7 @@ class AuthService:
 
 class Container(containers.DeclarativeContainer):
 
-    database = providers.Singleton(sqlite3.connect, ":memory:")
+    database = providers.Singleton(sqlite3.connect, ':memory:')
 
     user_service = providers.Factory(
         UserService,
@@ -32,7 +32,7 @@ class Container(containers.DeclarativeContainer):
     )
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     user_service = container.user_service()

examples/containers/declarative_override_decorator.py

@@ -8,7 +8,7 @@ from dependency_injector import containers, providers
 
 class Container(containers.DeclarativeContainer):
 
-    database = providers.Singleton(sqlite3.connect, ":memory:")
+    database = providers.Singleton(sqlite3.connect, ':memory:')
 
 
 # Overriding ``Container`` with ``OverridingContainer``:
@@ -18,7 +18,7 @@ class OverridingContainer(containers.DeclarativeContainer):
     database = providers.Singleton(mock.Mock)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     database = container.database()

examples/containers/declarative_override_providers.py

@@ -8,10 +8,10 @@ from dependency_injector import containers, providers
 
 class Container(containers.DeclarativeContainer):
 
-    database = providers.Singleton(sqlite3.connect, ":memory:")
+    database = providers.Singleton(sqlite3.connect, ':memory:')
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container(database=mock.Mock(sqlite3.Connection))
 
     database = container.database()

examples/containers/dynamic.py

@@ -3,7 +3,7 @@
 from dependency_injector import containers, providers
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = containers.DynamicContainer()
     container.factory1 = providers.Factory(object)
     container.factory2 = providers.Factory(object)
@@ -13,6 +13,6 @@ if __name__ == "__main__":
 
     print(container.providers)
     # {
-    #     "factory1": <dependency_injector.providers.Factory(...),
-    #     "factory2": <dependency_injector.providers.Factory(...),
+    #     'factory1': <dependency_injector.providers.Factory(...),
+    #     'factory2': <dependency_injector.providers.Factory(...),
     # }

examples/containers/dynamic_runtime_creation.py

@@ -13,20 +13,20 @@ class AuthService:
 
 def populate_container(container, providers_config):
     for provider_name, provider_info in providers_config.items():
-        provided_cls = globals().get(provider_info["class"])
-        provider_cls = getattr(providers, provider_info["provider_class"])
+        provided_cls = globals().get(provider_info['class'])
+        provider_cls = getattr(providers, provider_info['provider_class'])
         setattr(container, provider_name, provider_cls(provided_cls))
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     services_config = {
-        "user": {
-            "class": "UserService",
-            "provider_class": "Factory",
+        'user': {
+            'class': 'UserService',
+            'provider_class': 'Factory',
         },
-        "auth": {
-            "class": "AuthService",
-            "provider_class": "Factory",
+        'auth': {
+            'class': 'AuthService',
+            'provider_class': 'Factory',
         },
     }
     services = containers.DynamicContainer()

examples/containers/inject_self.py

@@ -21,14 +21,14 @@ class Container(containers.DeclarativeContainer):
 
     __self__ = providers.Self()
 
-    service1 = providers.Factory(Service, name="Service 1")
-    service2 = providers.Factory(Service, name="Service 2")
-    service3 = providers.Factory(Service, name="Service 3")
+    service1 = providers.Factory(Service, name='Service 1')
+    service2 = providers.Factory(Service, name='Service 2')
+    service3 = providers.Factory(Service, name='Service 3')
 
     dispatcher = providers.Singleton(ServiceDispatcher, __self__)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     dispatcher = container.dispatcher()

examples/containers/override.py

@@ -21,7 +21,7 @@ class OverridingContainer(containers.DeclarativeContainer):
     service = providers.Factory(ServiceStub)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
     overriding_container = OverridingContainer()
 

examples/containers/reset_singletons.py

@@ -9,7 +9,7 @@ class Container(containers.DeclarativeContainer):
     service2 = providers.Singleton(object)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     service1 = container.service1()

examples/containers/reset_singletons_subcontainers.py

@@ -14,7 +14,7 @@ class Container(containers.DeclarativeContainer):
     sub = providers.Container(SubContainer)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     service1 = container.service()

examples/containers/reset_singletons_with.py

@@ -8,7 +8,7 @@ class Container(containers.DeclarativeContainer):
     service = providers.Singleton(object)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     service1 = container.service()

examples/containers/traverse.py

@@ -34,15 +34,15 @@ class Container(containers.DeclarativeContainer):
     )
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
 
     for provider in container.traverse():
         print(provider)
 
-    # <dependency_injector.providers.Configuration("config") at 0x10d37d200>
-    # <dependency_injector.providers.Factory(<class "__main__.Service">) at 0x10d3a2820>
+    # <dependency_injector.providers.Configuration('config') at 0x10d37d200>
+    # <dependency_injector.providers.Factory(<class '__main__.Service'>) at 0x10d3a2820>
     # <dependency_injector.providers.Resource(<function init_database at 0x10bd2cb80>) at 0x10d346b40>
-    # <dependency_injector.providers.ConfigurationOption("config.cache_hosts") at 0x10d37d350>
+    # <dependency_injector.providers.ConfigurationOption('config.cache_hosts') at 0x10d37d350>
     # <dependency_injector.providers.Resource(<function init_cache at 0x10be373a0>) at 0x10d346bc0>
-    # <dependency_injector.providers.ConfigurationOption("config.database_url") at 0x10d37d2e0>
+    # <dependency_injector.providers.ConfigurationOption('config.database_url') at 0x10d37d2e0>

examples/demo/after.py

@@ -3,27 +3,27 @@ import os
 
 class ApiClient:
 
-    def __init__(self, api_key: str, timeout: int) -> None:
+    def __init__(self, api_key: str, timeout: int):
         self.api_key = api_key  # <-- dependency is injected
         self.timeout = timeout  # <-- dependency is injected
 
 
 class Service:
 
-    def __init__(self, api_client: ApiClient) -> None:
+    def __init__(self, api_client: ApiClient):
         self.api_client = api_client  # <-- dependency is injected
 
 
-def main(service: Service) -> None:  # <-- dependency is injected
+def main(service: Service):  # <-- dependency is injected
     ...
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main(
         service=Service(
             api_client=ApiClient(
-                api_key=os.getenv("API_KEY"),
-                timeout=int(os.getenv("TIMEOUT")),
+                api_key=os.getenv('API_KEY'),
+                timeout=os.getenv('TIMEOUT'),
             ),
         ),
     )

examples/demo/before.py

@@ -4,8 +4,8 @@ import os
 class ApiClient:
 
     def __init__(self):
-        self.api_key = os.getenv("API_KEY")  # <-- dependency
-        self.timeout = os.getenv("TIMEOUT")  # <-- dependency
+        self.api_key = os.getenv('API_KEY')  # <-- dependency
+        self.timeout = os.getenv('TIMEOUT')  # <-- dependency
 
 
 class Service:
@@ -19,5 +19,5 @@ def main() -> None:
     ...
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()

examples/demo/with_di.py

@@ -1,7 +1,8 @@
+import sys
 from unittest import mock
 
 from dependency_injector import containers, providers
-from dependency_injector.wiring import Provide, inject
+from dependency_injector.wiring import inject, Provide
 
 from after import ApiClient, Service
 
@@ -13,7 +14,7 @@ class Container(containers.DeclarativeContainer):
     api_client = providers.Singleton(
         ApiClient,
         api_key=config.api_key,
-        timeout=config.timeout,
+        timeout=config.timeout.as_int(),
     )
 
     service = providers.Factory(
@@ -23,15 +24,15 @@ class Container(containers.DeclarativeContainer):
 
 
 @inject
-def main(service: Service = Provide[Container.service]) -> None:
+def main(service: Service = Provide[Container.service]):
     ...
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
-    container.config.api_key.from_env("API_KEY", required=True)
-    container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
-    container.wire(modules=[__name__])
+    container.config.api_key.from_env('API_KEY')
+    container.config.timeout.from_env('TIMEOUT')
+    container.wire(modules=[sys.modules[__name__]])
 
     main()  # <-- dependency is injected automatically
 

examples/miniapps/aiohttp/README.rst

@@ -27,16 +27,16 @@ To run the application do:
 .. code-block:: bash
 
     export GIPHY_API_KEY=wBJ2wZG7SRqfrU9nPgPiWvORmloDyuL0
-    python -m giphynavigator.application
+    adev runserver giphynavigator/application.py --livereload
 
 The output should be something like:
 
 .. code-block::
 
-   ======== Running on http://0.0.0.0:8080 ========
-   (Press CTRL+C to quit)
+   [18:52:59] Starting aux server at http://localhost:8001 ◆
+   [18:52:59] Starting dev server at http://localhost:8000 ●
 
-After that visit http://0.0.0.0:8080/ in your browser or use CLI command (``curl``, ``httpie``,
+After that visit http://127.0.0.1:8000/ in your browser or use CLI command (``curl``, ``httpie``,
 etc). You should see something like:
 
 .. code-block:: json
@@ -98,22 +98,21 @@ The output should be something like:
 
 .. code-block::
 
-   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: cov-6.0.0, anyio-4.4.0, asyncio-0.24.0, aiohttp-1.0.5
-   asyncio: mode=Mode.STRICT, default_loop_scope=None
+   platform darwin -- Python 3.8.3, pytest-5.4.3, py-1.9.0, pluggy-0.13.1
+   plugins: cov-2.10.0, aiohttp-0.3.0, asyncio-0.14.0
    collected 3 items
 
    giphynavigator/tests.py ...                                     [100%]
 
-   ---------- coverage: platform darwin, python 3.10.0-final-0 ----------
+   ---------- coverage: platform darwin, python 3.8.3-final-0 -----------
    Name                            Stmts   Miss  Cover
    ---------------------------------------------------
    giphynavigator/__init__.py          0      0   100%
-   giphynavigator/application.py      13      2    85%
-   giphynavigator/containers.py        7      0   100%
+   giphynavigator/application.py      12      0   100%
+   giphynavigator/containers.py        6      0   100%
    giphynavigator/giphy.py            14      9    36%
    giphynavigator/handlers.py         10      0   100%
    giphynavigator/services.py          9      1    89%
    giphynavigator/tests.py            37      0   100%
    ---------------------------------------------------
-   TOTAL                              90     12    87%
+   TOTAL                              88     10    89%

examples/miniapps/aiohttp/giphynavigator/application.py

@@ -8,16 +8,13 @@ from . import handlers
 
 def create_app() -> web.Application:
     container = Container()
-    container.config.giphy.api_key.from_env("GIPHY_API_KEY")
+    container.config.from_yaml('config.yml')
+    container.config.giphy.api_key.from_env('GIPHY_API_KEY')
+    container.wire(modules=[handlers])
 
     app = web.Application()
     app.container = container
     app.add_routes([
-        web.get("/", handlers.index),
+        web.get('/', handlers.index),
     ])
     return app
-
-
-if __name__ == "__main__":
-    app = create_app()
-    web.run_app(app)

examples/miniapps/aiohttp/giphynavigator/containers.py

@@ -7,9 +7,7 @@ from . import giphy, services
 
 class Container(containers.DeclarativeContainer):
 
-    wiring_config = containers.WiringConfiguration(modules=[".handlers"])
-
-    config = providers.Configuration(yaml_files=["config.yml"])
+    config = providers.Configuration()
 
     giphy_client = providers.Factory(
         giphy.GiphyClient,

examples/miniapps/aiohttp/giphynavigator/giphy.py

@@ -5,7 +5,7 @@ from aiohttp import ClientSession, ClientTimeout
 
 class GiphyClient:
 
-    API_URL = "https://api.giphy.com/v1"
+    API_URL = 'https://api.giphy.com/v1'
 
     def __init__(self, api_key, timeout):
         self._api_key = api_key
@@ -13,11 +13,11 @@ class GiphyClient:
 
     async def search(self, query, limit):
         """Make search API call and return result."""
-        url = f"{self.API_URL}/gifs/search"
+        url = f'{self.API_URL}/gifs/search'
         params = {
-            "q": query,
-            "api_key": self._api_key,
-            "limit": limit,
+            'q': query,
+            'api_key': self._api_key,
+            'limit': limit,
         }
         async with ClientSession(timeout=self._timeout) as session:
             async with session.get(url, params=params) as response:

examples/miniapps/aiohttp/giphynavigator/handlers.py

@@ -14,15 +14,15 @@ async def index(
         default_query: str = Provide[Container.config.default.query],
         default_limit: int = Provide[Container.config.default.limit.as_int()],
 ) -> web.Response:
-    query = request.query.get("query", default_query)
-    limit = int(request.query.get("limit", default_limit))
+    query = request.query.get('query', default_query)
+    limit = int(request.query.get('limit', default_limit))
 
     gifs = await search_service.search(query, limit)
 
     return web.json_response(
         {
-            "query": query,
-            "limit": limit,
-            "gifs": gifs,
+            'query': query,
+            'limit': limit,
+            'gifs': gifs,
         },
     )

examples/miniapps/aiohttp/giphynavigator/services.py

@@ -15,4 +15,4 @@ class SearchService:
 
         result = await self._giphy_client.search(query, limit)
 
-        return [{"url": gif["url"]} for gif in result["data"]]
+        return [{'url': gif['url']} for gif in result['data']]

examples/miniapps/aiohttp/giphynavigator/tests.py

@@ -3,15 +3,11 @@
 from unittest import mock
 
 import pytest
-import pytest_asyncio
 
 from giphynavigator.application import create_app
 from giphynavigator.giphy import GiphyClient
 
 
-pytestmark = pytest.mark.asyncio
-
-
 @pytest.fixture
 def app():
     app = create_app()
@@ -19,37 +15,37 @@ def app():
     app.container.unwire()
 
 
-@pytest_asyncio.fixture
-async def client(app, aiohttp_client):
-    return await aiohttp_client(app)
+@pytest.fixture
+def client(app, aiohttp_client, loop):
+    return loop.run_until_complete(aiohttp_client(app))
 
 
 async def test_index(client, app):
     giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
     giphy_client_mock.search.return_value = {
-        "data": [
-            {"url": "https://giphy.com/gif1.gif"},
-            {"url": "https://giphy.com/gif2.gif"},
+        'data': [
+            {'url': 'https://giphy.com/gif1.gif'},
+            {'url': 'https://giphy.com/gif2.gif'},
         ],
     }
 
     with app.container.giphy_client.override(giphy_client_mock):
         response = await client.get(
-            "/",
+            '/',
             params={
-                "query": "test",
-                "limit": 10,
+                'query': 'test',
+                'limit': 10,
             },
         )
 
     assert response.status == 200
     data = await response.json()
     assert data == {
-        "query": "test",
-        "limit": 10,
-        "gifs": [
-            {"url": "https://giphy.com/gif1.gif"},
-            {"url": "https://giphy.com/gif2.gif"},
+        'query': 'test',
+        'limit': 10,
+        'gifs': [
+            {'url': 'https://giphy.com/gif1.gif'},
+            {'url': 'https://giphy.com/gif2.gif'},
         ],
     }
 
@@ -57,27 +53,27 @@ async def test_index(client, app):
 async def test_index_no_data(client, app):
     giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
     giphy_client_mock.search.return_value = {
-        "data": [],
+        'data': [],
     }
 
     with app.container.giphy_client.override(giphy_client_mock):
-        response = await client.get("/")
+        response = await client.get('/')
 
     assert response.status == 200
     data = await response.json()
-    assert data["gifs"] == []
+    assert data['gifs'] == []
 
 
 async def test_index_default_params(client, app):
     giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
     giphy_client_mock.search.return_value = {
-        "data": [],
+        'data': [],
     }
 
     with app.container.giphy_client.override(giphy_client_mock):
-        response = await client.get("/")
+        response = await client.get('/')
 
     assert response.status == 200
     data = await response.json()
-    assert data["query"] == app.container.config.default.query()
-    assert data["limit"] == app.container.config.default.limit()
+    assert data['query'] == app.container.config.default.query()
+    assert data['limit'] == app.container.config.default.limit()

examples/miniapps/aiohttp/requirements.txt

@@ -1,6 +1,6 @@
 dependency-injector
 aiohttp
+aiohttp-devtools
 pyyaml
 pytest-aiohttp
-pytest-asyncio
 pytest-cov

examples/miniapps/application-multiple-containers-runtime-overriding/example/__main__.py

@@ -3,7 +3,7 @@
 from .containers import Application
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     application = Application()
     config = application.service.config()
     config.build()

examples/miniapps/application-multiple-containers-runtime-overriding/example/containers.py

@@ -6,17 +6,17 @@ from .services import ConfigService
 
 
 class Core(containers.DeclarativeContainer):
-    config = providers.Configuration("config")
+    config = providers.Configuration('config')
 
 
 class Storage(containers.DeclarativeContainer):
-    queue = providers.Singleton(lambda: "Some storage")
+    queue = providers.Singleton(lambda: 'Some storage')
 
 
 class Adapter(containers.DeclarativeContainer):
     core = providers.DependenciesContainer(config=providers.Configuration())
     tinydb = providers.Singleton(
-        lambda db_path: f"DB Path=[{db_path}]",
+        lambda db_path: f'DB Path=[{db_path}]',
         db_path=core.config.default.db_path,
     )
 
@@ -25,7 +25,7 @@ class Repository(containers.DeclarativeContainer):
     adapter = providers.DependenciesContainer()
     storage = providers.DependenciesContainer()
     site = providers.Singleton(
-        lambda adapter, queue: f"Adapter=[{adapter}], queue=[{queue}]",
+        lambda adapter, queue: f'Adapter=[{adapter}], queue=[{queue}]',
         adapter=adapter.tinydb,
         queue=storage.queue,
     )

examples/miniapps/application-multiple-containers-runtime-overriding/example/services.py

@@ -6,4 +6,4 @@ class ConfigService:
         self._config = config
 
     def build(self):
-        self._config.from_dict({"default": {"db_path": "~/test"}})
+        self._config.from_dict({'default': {'db_path': '~/test'}})

examples/miniapps/application-multiple-containers/example/__main__.py

@@ -2,7 +2,7 @@
 
 import sys
 
-from dependency_injector.wiring import Provide, inject
+from dependency_injector.wiring import inject, Provide
 
 from .services import UserService, AuthService, PhotoService
 from .containers import Application
@@ -22,9 +22,10 @@ def main(
     photo_service.upload_photo(user, photo)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     application = Application()
+    application.config.from_yaml('config.yml')
     application.core.init_resources()
-    application.wire(modules=[__name__])
+    application.wire(modules=[sys.modules[__name__]])
 
     main(*sys.argv[1:])

examples/miniapps/application-multiple-containers/example/containers.py

@@ -30,7 +30,7 @@ class Gateways(containers.DeclarativeContainer):
 
     s3_client = providers.Singleton(
         boto3.client,
-        service_name="s3",
+        service_name='s3',
         aws_access_key_id=config.aws.access_key_id,
         aws_secret_access_key=config.aws.secret_access_key,
     )
@@ -61,7 +61,7 @@ class Services(containers.DeclarativeContainer):
 
 class Application(containers.DeclarativeContainer):
 
-    config = providers.Configuration(yaml_files=["config.yml"])
+    config = providers.Configuration()
 
     core = providers.Container(
         Core,

examples/miniapps/application-multiple-containers/example/services.py

@@ -11,7 +11,7 @@ class BaseService:
 
     def __init__(self) -> None:
         self.logger = logging.getLogger(
-            f"{__name__}.{self.__class__.__name__}",
+            f'{__name__}.{self.__class__.__name__}',
         )
 
 
@@ -22,8 +22,8 @@ class UserService(BaseService):
         super().__init__()
 
     def get_user(self, email: str) -> Dict[str, str]:
-        self.logger.debug("User %s has been found in database", email)
-        return {"email": email, "password_hash": "..."}
+        self.logger.debug('User %s has been found in database', email)
+        return {'email': email, 'password_hash': '...'}
 
 
 class AuthService(BaseService):
@@ -36,8 +36,8 @@ class AuthService(BaseService):
     def authenticate(self, user: Dict[str, str], password: str) -> None:
         assert password is not None
         self.logger.debug(
-            "User %s has been successfully authenticated",
-            user["email"],
+            'User %s has been successfully authenticated',
+            user['email'],
         )
 
 
@@ -50,7 +50,7 @@ class PhotoService(BaseService):
 
     def upload_photo(self, user: Dict[str, str], photo_path: str) -> None:
         self.logger.debug(
-            "Photo %s has been successfully uploaded by user %s",
+            'Photo %s has been successfully uploaded by user %s',
             photo_path,
-            user["email"],
+            user['email'],
         )

examples/miniapps/application-single-container/example/__main__.py

@@ -2,7 +2,7 @@
 
 import sys
 
-from dependency_injector.wiring import Provide, inject
+from dependency_injector.wiring import inject, Provide
 
 from .services import UserService, AuthService, PhotoService
 from .containers import Container
@@ -22,9 +22,10 @@ def main(
     photo_service.upload_photo(user, photo)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
     container.init_resources()
-    container.wire(modules=[__name__])
+    container.config.from_ini('config.ini')
+    container.wire(modules=[sys.modules[__name__]])
 
     main(*sys.argv[1:])

examples/miniapps/application-single-container/example/containers.py

@@ -11,11 +11,11 @@ from . import services
 
 class Container(containers.DeclarativeContainer):
 
-    config = providers.Configuration(ini_files=["config.ini"])
+    config = providers.Configuration()
 
     logging = providers.Resource(
         logging.config.fileConfig,
-        fname="logging.ini",
+        fname='logging.ini',
     )
 
     # Gateways
@@ -27,7 +27,7 @@ class Container(containers.DeclarativeContainer):
 
     s3_client = providers.Singleton(
         boto3.client,
-        service_name="s3",
+        service_name='s3',
         aws_access_key_id=config.aws.access_key_id,
         aws_secret_access_key=config.aws.secret_access_key,
     )

examples/miniapps/application-single-container/example/services.py

@@ -11,7 +11,7 @@ class BaseService:
 
     def __init__(self) -> None:
         self.logger = logging.getLogger(
-            f"{__name__}.{self.__class__.__name__}",
+            f'{__name__}.{self.__class__.__name__}',
         )
 
 
@@ -22,8 +22,8 @@ class UserService(BaseService):
         super().__init__()
 
     def get_user(self, email: str) -> Dict[str, str]:
-        self.logger.debug("User %s has been found in database", email)
-        return {"email": email, "password_hash": "..."}
+        self.logger.debug('User %s has been found in database', email)
+        return {'email': email, 'password_hash': '...'}
 
 
 class AuthService(BaseService):
@@ -36,8 +36,8 @@ class AuthService(BaseService):
     def authenticate(self, user: Dict[str, str], password: str) -> None:
         assert password is not None
         self.logger.debug(
-            "User %s has been successfully authenticated",
-            user["email"],
+            'User %s has been successfully authenticated',
+            user['email'],
         )
 
 
@@ -50,7 +50,7 @@ class PhotoService(BaseService):
 
     def upload_photo(self, user: Dict[str, str], photo_path: str) -> None:
         self.logger.debug(
-            "Photo %s has been successfully uploaded by user %s",
+            'Photo %s has been successfully uploaded by user %s',
             photo_path,
-            user["email"],
+            user['email'],
         )

examples/miniapps/asyncio-daemon/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-bookworm
+FROM python:3.8-buster
 
 ENV PYTHONUNBUFFERED=1
 

examples/miniapps/asyncio-daemon/README.rst

@@ -13,13 +13,13 @@ Build the Docker image:
 
 .. code-block:: bash
 
-   docker compose build
+   docker-compose build
 
 Run the docker-compose environment:
 
 .. code-block:: bash
 
-    docker compose up
+    docker-compose up
 
 The output should be something like:
 
@@ -59,29 +59,28 @@ To run the tests do:
 
 .. code-block:: bash
 
-   docker compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
+   docker-compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
 
 The output should be something like:
 
 .. code-block::
 
-   platform linux -- Python 3.13.1, pytest-8.3.4, pluggy-1.5.0
+   platform linux -- Python 3.8.3, pytest-6.0.1, py-1.9.0, pluggy-0.13.1
    rootdir: /code
-   plugins: cov-6.0.0, asyncio-0.24.0
-   asyncio: mode=Mode.STRICT, default_loop_scope=None
+   plugins: asyncio-0.14.0, cov-2.10.0
    collected 2 items
 
    monitoringdaemon/tests.py ..                                    [100%]
 
-   ---------- coverage: platform linux, python 3.10.0-final-0 -----------
+   ----------- coverage: platform linux, python 3.8.3-final-0 -----------
    Name                             Stmts   Miss  Cover
    ----------------------------------------------------
    monitoringdaemon/__init__.py         0      0   100%
-   monitoringdaemon/__main__.py        11     11     0%
+   monitoringdaemon/__main__.py        13     13     0%
    monitoringdaemon/containers.py      11      0   100%
-   monitoringdaemon/dispatcher.py      45      5    89%
+   monitoringdaemon/dispatcher.py      44      5    89%
    monitoringdaemon/http.py             6      3    50%
    monitoringdaemon/monitors.py        23      1    96%
-   monitoringdaemon/tests.py           35      0   100%
+   monitoringdaemon/tests.py           37      0   100%
    ----------------------------------------------------
-   TOTAL                              131     20    85%
+   TOTAL                              134     22    84%

examples/miniapps/asyncio-daemon/monitoringdaemon/__main__.py

@@ -1,5 +1,7 @@
 """Main module."""
 
+import sys
+
 from dependency_injector.wiring import inject, Provide
 
 from .dispatcher import Dispatcher
@@ -11,9 +13,10 @@ def main(dispatcher: Dispatcher = Provide[Container.dispatcher]) -> None:
     dispatcher.run()
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
+    container.config.from_yaml('config.yml')
     container.init_resources()
-    container.wire(modules=[__name__])
+    container.wire(modules=[sys.modules[__name__]])
 
     main()

examples/miniapps/asyncio-daemon/monitoringdaemon/containers.py

@@ -10,7 +10,7 @@ from . import http, monitors, dispatcher
 
 class Container(containers.DeclarativeContainer):
 
-    config = providers.Configuration(yaml_files=["config.yml"])
+    config = providers.Configuration()
 
     logging = providers.Resource(
         logging.basicConfig,

examples/miniapps/asyncio-daemon/monitoringdaemon/dispatcher.py

@@ -21,7 +21,7 @@ class Dispatcher:
         asyncio.run(self.start())
 
     async def start(self) -> None:
-        self._logger.info("Starting up")
+        self._logger.info('Starting up')
 
         for monitor in self._monitors:
             self._monitor_tasks.append(
@@ -41,11 +41,11 @@ class Dispatcher:
 
         self._stopping = True
 
-        self._logger.info("Shutting down")
+        self._logger.info('Shutting down')
         for task, monitor in zip(self._monitor_tasks, self._monitors):
             task.cancel()
         self._monitor_tasks.clear()
-        self._logger.info("Shutdown finished successfully")
+        self._logger.info('Shutdown finished successfully')
 
     @staticmethod
     async def _run_monitor(monitor: Monitor) -> None:
@@ -61,6 +61,6 @@ class Dispatcher:
             except asyncio.CancelledError:
                 break
             except Exception:
-                monitor.logger.exception("Error executing monitor check")
+                monitor.logger.exception('Error executing monitor check')
 
             await asyncio.sleep(_until_next(last=time_start))

examples/miniapps/asyncio-daemon/monitoringdaemon/monitors.py

@@ -25,10 +25,10 @@ class HttpMonitor(Monitor):
             options: Dict[str, Any],
     ) -> None:
         self._client = http_client
-        self._method = options.pop("method")
-        self._url = options.pop("url")
-        self._timeout = options.pop("timeout")
-        super().__init__(check_every=options.pop("check_every"))
+        self._method = options.pop('method')
+        self._url = options.pop('url')
+        self._timeout = options.pop('timeout')
+        super().__init__(check_every=options.pop('check_every'))
 
     async def check(self) -> None:
         time_start = time.time()
@@ -43,11 +43,11 @@ class HttpMonitor(Monitor):
         time_took = time_end - time_start
 
         self.logger.info(
-            "Check\n"
-            "    %s %s\n"
-            "    response code: %s\n"
-            "    content length: %s\n"
-            "    request took: %s seconds",
+            'Check\n'
+            '    %s %s\n'
+            '    response code: %s\n'
+            '    content length: %s\n'
+            '    request took: %s seconds',
             self._method,
             self._url,
             response.status,

examples/miniapps/asyncio-daemon/monitoringdaemon/tests.py

@@ -17,33 +17,33 @@ class RequestStub:
 
 @pytest.fixture
 def container():
-    return Container(
-        config={
-            "log": {
-                "level": "INFO",
-                "formant": "[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s",
+    container = Container()
+    container.config.from_dict({
+        'log': {
+            'level': 'INFO',
+            'formant': '[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s',
+        },
+        'monitors': {
+            'example': {
+                'method': 'GET',
+                'url': 'http://fake-example.com',
+                'timeout': 1,
+                'check_every': 1,
             },
-            "monitors": {
-                "example": {
-                    "method": "GET",
-                    "url": "http://fake-example.com",
-                    "timeout": 1,
-                    "check_every": 1,
-                },
-                "httpbin": {
-                    "method": "GET",
-                    "url": "https://fake-httpbin.org/get",
-                    "timeout": 1,
-                    "check_every": 1,
-                },
+            'httpbin': {
+                'method': 'GET',
+                'url': 'https://fake-httpbin.org/get',
+                'timeout': 1,
+                'check_every': 1,
             },
-        }
-    )
+        },
+    })
+    return container
 
 
 @pytest.mark.asyncio
 async def test_example_monitor(container, caplog):
-    caplog.set_level("INFO")
+    caplog.set_level('INFO')
 
     http_client_mock = mock.AsyncMock()
     http_client_mock.request.return_value = RequestStub(
@@ -55,24 +55,22 @@ async def test_example_monitor(container, caplog):
         example_monitor = container.example_monitor()
         await example_monitor.check()
 
-    assert "http://fake-example.com" in caplog.text
-    assert "response code: 200" in caplog.text
-    assert "content length: 635" in caplog.text
+    assert 'http://fake-example.com' in caplog.text
+    assert 'response code: 200' in caplog.text
+    assert 'content length: 635' in caplog.text
 
 
 @pytest.mark.asyncio
-async def test_dispatcher(container, caplog):
-    caplog.set_level("INFO")
+async def test_dispatcher(container, caplog, event_loop):
+    caplog.set_level('INFO')
 
     example_monitor_mock = mock.AsyncMock()
     httpbin_monitor_mock = mock.AsyncMock()
 
-    with container.override_providers(
-            example_monitor=example_monitor_mock,
-            httpbin_monitor=httpbin_monitor_mock,
-    ):
+    with container.example_monitor.override(example_monitor_mock), \
+            container.httpbin_monitor.override(httpbin_monitor_mock):
+
         dispatcher = container.dispatcher()
-        event_loop = asyncio.get_running_loop()
         event_loop.create_task(dispatcher.start())
         await asyncio.sleep(0.1)
         dispatcher.stop()

examples/miniapps/boto3-session/boto3_session_example.py

@@ -23,12 +23,12 @@ class Container(containers.DeclarativeContainer):
 
     s3_client = providers.Resource(
         session.provided.client.call(),
-        service_name="s3",
+        service_name='s3',
     )
 
     sqs_client = providers.Resource(
         providers.MethodCaller(session.provided.client),  # Alternative syntax
-        service_name="sqs",
+        service_name='sqs',
     )
 
     service1 = providers.Factory(
@@ -39,16 +39,16 @@ class Container(containers.DeclarativeContainer):
 
     service2 = providers.Factory(
         Service,
-        s3_client=session.provided.client.call(service_name="s3"),    # Alternative inline syntax
-        sqs_client=session.provided.client.call(service_name="sqs"),  # Alternative inline syntax
+        s3_client=session.provided.client.call(service_name='s3'),    # Alternative inline syntax
+        sqs_client=session.provided.client.call(service_name='sqs'),  # Alternative inline syntax
     )
 
 
 def main():
     container = Container()
-    container.config.aws_access_key_id.from_env("AWS_ACCESS_KEY_ID")
-    container.config.aws_secret_access_key.from_env("AWS_SECRET_ACCESS_KEY")
-    container.config.aws_session_token.from_env("AWS_SESSION_TOKEN")
+    container.config.aws_access_key_id.from_env('AWS_ACCESS_KEY_ID')
+    container.config.aws_secret_access_key.from_env('AWS_SECRET_ACCESS_KEY')
+    container.config.aws_session_token.from_env('AWS_SESSION_TOKEN')
     container.init_resources()
 
     s3_client = container.s3_client()
@@ -62,11 +62,11 @@ def main():
     assert service1.s3_client is s3_client
     assert service1.sqs_client is sqs_client
 
-    service2 = container.service2()
+    service2 = container.service1()
     print(service2, service2.s3_client, service2.sqs_client)
-    assert service2.s3_client.__class__.__name__ == "S3"
-    assert service2.sqs_client.__class__.__name__ == "SQS"
+    assert service2.s3_client is s3_client
+    assert service2.sqs_client is sqs_client
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()

examples/miniapps/commands-and-handlers/application/__main__.py

@@ -4,7 +4,7 @@ from .containers import Container
 from .commands import SaveRating, DoSomethingElse
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     container = Container()
     message_bus = container.message_bus()
 

examples/miniapps/commands-and-handlers/application/handler.py

@@ -8,7 +8,7 @@ class CommandHandler:
         self.rating_repo = rating_repo
 
     def save_rating(self):
-        print("Saving rating")
+        print('Saving rating')
 
     def something_else(self):
-        print("Doing something else")
+        print('Doing something else')

examples/miniapps/decoupled-packages/example/__main__.py

@@ -1,6 +1,8 @@
 """Main module."""
 
-from dependency_injector.wiring import Provide, inject
+import sys
+
+from dependency_injector.wiring import inject, Provide
 
 from .user.repositories import UserRepository
 from .photo.repositories import PhotoRepository
@@ -22,19 +24,20 @@ def main(
 ) -> None:
     user1 = user_repository.get(id=1)
     user1_photos = photo_repository.get_photos(user1.id)
-    print(f"Retrieve user id={user1.id}, photos count={len(user1_photos)}")
+    print(f'Retrieve user id={user1.id}, photos count={len(user1_photos)}')
 
     user2 = user_repository.get(id=2)
     user2_photos = photo_repository.get_photos(user2.id)
-    print(f"Retrieve user id={user2.id}, photos count={len(user2_photos)}")
+    print(f'Retrieve user id={user2.id}, photos count={len(user2_photos)}')
 
     assert aggregation_service.user_repository is user_repository
     assert aggregation_service.photo_repository is photo_repository
-    print("Aggregate analytics from user and photo packages")
+    print('Aggregate analytics from user and photo packages')
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     application = ApplicationContainer()
-    application.wire(modules=[__name__])
+    application.config.from_ini('config.ini')
+    application.wire(modules=[sys.modules[__name__]])
 
     main()

examples/miniapps/decoupled-packages/example/containers.py

@@ -12,13 +12,13 @@ from .analytics.containers import AnalyticsContainer
 
 class ApplicationContainer(containers.DeclarativeContainer):
 
-    config = providers.Configuration(ini_files=["config.ini"])
+    config = providers.Configuration()
 
     sqlite = providers.Singleton(sqlite3.connect, config.database.dsn)
 
     s3 = providers.Singleton(
         boto3.client,
-        service_name="s3",
+        service_name='s3',
         aws_access_key_id=config.aws.access_key_id,
         aws_secret_access_key=config.aws.secret_access_key,
     )