Merge branch 'release/4.37.0' into master

Author: rmk135

.github/workflows/publishing.yml

@@ -9,28 +9,28 @@ jobs:
 
   tests:
     name: Run tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install tox
       - run: tox
         env:
-          TOXENV: 3.9
+          TOXENV: "3.10"
 
   linters:
     name: Run linters
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         toxenv: [flake8, pydocstyle, mypy, pylint]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install tox
       - run: tox
         env:
@@ -39,12 +39,12 @@ jobs:
   build-sdist:
     name: Build source tarball
     needs: [tests, linters]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: python setup.py sdist
       - uses: actions/upload-artifact@v2
         with:
@@ -56,15 +56,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-2019, macOS-10.15]
     env:
       CIBW_SKIP: cp27-win*
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
-      - run: pip install cibuildwheel==1.8.0
+          python-version: "3.10"
+      - run: pip install cibuildwheel==2.1.3
       - run: cibuildwheel --output-dir wheelhouse
       - uses: actions/upload-artifact@v2
         with:
@@ -73,15 +73,15 @@ jobs:
   build-wheels-linux-aarch64:
     name: Build wheels (ubuntu-latest-aarch64)
     needs: [tests, linters]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.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
+          python-version: "3.10"
+      - run: pip install cibuildwheel==2.1.3
       - run: cibuildwheel --archs aarch64 --output-dir wheelhouse
       - uses: actions/upload-artifact@v2
         with:
@@ -90,7 +90,7 @@ jobs:
   publish:
     name: Publish on PyPI
     needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/download-artifact@v2
         with:
@@ -100,6 +100,9 @@ jobs:
         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
@@ -109,7 +112,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install -r requirements-doc.txt
       - run: pip install awscli
       - run: pip install -e .

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

@@ -6,10 +6,10 @@ jobs:
 
   test-on-different-versions:
     name: Run tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", pypy2, pypy3]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install tox cython
       - run: make cythonize
       - run: tox
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: pip install tox
       - run: tox
         env:

.gitignore

@@ -36,6 +36,7 @@ reports/
 .cache
 nosetests.xml
 coverage.xml
+.hypothesis/
 
 # Translations
 *.mo
@@ -54,7 +55,7 @@ target/
 .idea/
 
 # Virtualenv
-venv/
+venv*/
 
 # SQLite
 *.db

Makefile

@@ -45,17 +45,10 @@ install: uninstall clean cythonize
 uninstall:
 	- pip uninstall -y -q dependency-injector 2> /dev/null
 
-test-py2: build
+test:
 	# Unit tests with coverage report
 	coverage erase
-	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 run --rcfile=./.coveragerc -m pytest -c tests/.configs/pytest.ini
 	coverage report --rcfile=./.coveragerc
 	coverage html --rcfile=./.coveragerc
 

README.rst

@@ -80,7 +80,7 @@ Key features of the ``Dependency Injector``:
 .. code-block:: python
 
    from dependency_injector import containers, providers
-   from dependency_injector.wiring import inject, Provide
+   from dependency_injector.wiring import Provide, inject
 
 
    class Container(containers.DeclarativeContainer):
@@ -104,11 +104,11 @@ Key features of the ``Dependency Injector``:
        ...
 
 
-   if __name__ == '__main__':
+   if __name__ == "__main__":
        container = Container()
-       container.config.api_key.from_env('API_KEY')
-       container.config.timeout.from_env('TIMEOUT')
-       container.wire(modules=[sys.modules[__name__]])
+       container.config.api_key.from_env("API_KEY")
+       container.config.timeout.from_env("TIMEOUT")
+       container.wire(modules=[__name__])
 
        main()  # <-- dependency is injected automatically
 
@@ -195,7 +195,7 @@ 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 doing the dependency injection?
  - you start writing the code following the dependency injection principle
@@ -204,7 +204,7 @@ How do I start doing 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 be an extra work in the beginning
  - it will payoff as the project grows
 
 Have a question?