Merge branch 'release/4.29.1' into master

rmk135 · rmk135 · commit b3bcf60ced8a · 2021-03-05T20:20:10.000-05:00
diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
@@ -9,7 +9,7 @@ jobs:
 
   tests:
     name: Run tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -22,7 +22,7 @@ jobs:
 
   linters:
     name: Run linters
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         toxenv: [flake8, pydocstyle, mypy, pylint]
@@ -39,7 +39,7 @@ jobs:
   build-sdist:
     name: Build source tarball
     needs: [tests, linters]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -56,7 +56,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-18.04, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -75,7 +75,7 @@ jobs:
   build-wheels-linux-aarch64:
     name: Build wheels (ubuntu-latest-aarch64)
     needs: [tests, linters]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up QEMU
@@ -92,7 +92,7 @@ jobs:
   publish:
     name: Publish on PyPI
     needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/download-artifact@v2
         with:
@@ -106,7 +106,7 @@ jobs:
   publish-docs:
     name: Publish docs
     needs: [publish]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
diff --git a/Makefile b/Makefile
@@ -48,14 +48,14 @@ uninstall:
 test-py2: build
 	# Unit tests with coverage report
 	coverage erase
-	coverage run --rcfile=./.coveragerc -m unittest2 discover -s tests/unit/ -p test_*_py2_py3.py
+	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 unittest2 discover -s tests/unit/ -p test_*py3*.py
+	coverage run --rcfile=./.coveragerc -m unittest discover -s tests/unit/ -p test_*py3*.py
 	coverage report --rcfile=./.coveragerc
 	coverage html --rcfile=./.coveragerc
 
diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
@@ -14,6 +14,7 @@ follows `Semantic versioning`_
   Thanks to `@GitterRemote <https://github.com/GitterRemote>`_ for reporting the issue.
 - Add docs and example for ``Factory.add_attributes()`` method.
 - Remove legacy css file.
+- Remove ``unittest2`` test dependency.
 
 4.29.0
 ------
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,5 @@
 cython==0.29.21
 tox
-unittest2
 coverage
 flake8
 pydocstyle
diff --git a/tests/unit/containers/test_declarative_py2_py3.py b/tests/unit/containers/test_declarative_py2_py3.py
@@ -1,7 +1,7 @@
 """Dependency injector declarative container unit tests."""
 
 import collections
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     containers,
diff --git a/tests/unit/containers/test_dynamic_async_resources_py36.py b/tests/unit/containers/test_dynamic_async_resources_py36.py
@@ -1,6 +1,6 @@
 """Dependency injector dynamic container unit tests for async resources."""
 
-import unittest2 as unittest
+import unittest
 
 # Runtime import to get asyncutils module
 import os
diff --git a/tests/unit/containers/test_dynamic_py2_py3.py b/tests/unit/containers/test_dynamic_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector dynamic container unit tests."""
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     containers,
diff --git a/tests/unit/ext/test_flask_py2_py3.py b/tests/unit/ext/test_flask_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector Flask extension unit tests."""
 
-import unittest2 as unittest
+import unittest
 from flask import Flask, url_for
 from flask.views import MethodView
 
diff --git a/tests/unit/providers/test_base_py2_py3.py b/tests/unit/providers/test_base_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector base providers unit tests."""
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     containers,
diff --git a/tests/unit/providers/test_callables_py2_py3.py b/tests/unit/providers/test_callables_py2_py3.py
@@ -2,7 +2,7 @@
 
 import sys
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     providers,
diff --git a/tests/unit/providers/test_configuration_py2_py3.py b/tests/unit/providers/test_configuration_py2_py3.py
@@ -6,7 +6,7 @@
 import sys
 import tempfile
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import containers, providers, errors
 try:
@@ -106,6 +106,7 @@ def test_as_(self):
 
         self.assertEqual(value, decimal.Decimal('123.123'))
 
+    @unittest.skipIf(sys.version_info[:2] == (2, 7), 'Python 2.7 does not support this assert')
     def test_required(self):
         provider = providers.Callable(
             lambda value: value,
@@ -218,11 +219,13 @@ def test_providers_with_default_value_overriding(self):
     def test_value_of_undefined_option(self):
         self.assertIsNone(self.config.a())
 
+    @unittest.skipIf(sys.version_info[:2] == (2, 7), 'Python 2.7 does not support this assert')
     def test_value_of_undefined_option_in_strict_mode(self):
         self.config = providers.Configuration(strict=True)
         with self.assertRaisesRegex(errors.Error, 'Undefined configuration option "config.a"'):
             self.config.a()
 
+    @unittest.skipIf(sys.version_info[:2] == (2, 7), 'Python 2.7 does not support this assert')
     def test_value_of_undefined_option_with_root_none_in_strict_mode(self):
         self.config = providers.Configuration(strict=True)
         self.config.override(None)
diff --git a/tests/unit/providers/test_container_py2_py3.py b/tests/unit/providers/test_container_py2_py3.py
@@ -2,7 +2,7 @@
 
 import copy
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import containers, providers, errors
 
diff --git a/tests/unit/providers/test_coroutines_py35.py b/tests/unit/providers/test_coroutines_py35.py
@@ -2,7 +2,7 @@
 
 import asyncio
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     providers,
diff --git a/tests/unit/providers/test_dict_py2_py3.py b/tests/unit/providers/test_dict_py2_py3.py
@@ -2,7 +2,7 @@
 
 import sys
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import providers
 
diff --git a/tests/unit/providers/test_factories_py2_py3.py b/tests/unit/providers/test_factories_py2_py3.py
@@ -2,7 +2,7 @@
 
 import sys
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     providers,
diff --git a/tests/unit/providers/test_injections_py2_py3.py b/tests/unit/providers/test_injections_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector injections unit tests."""
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import providers
 
diff --git a/tests/unit/providers/test_list_py2_py3.py b/tests/unit/providers/test_list_py2_py3.py
@@ -2,7 +2,7 @@
 
 import sys
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import providers
 
diff --git a/tests/unit/providers/test_provided_instance_py2_py3.py b/tests/unit/providers/test_provided_instance_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector provided instance provider unit tests."""
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import containers, providers
 
diff --git a/tests/unit/providers/test_resource_py35.py b/tests/unit/providers/test_resource_py35.py
@@ -2,7 +2,7 @@
 
 import asyncio
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import containers, providers, resources, errors
 
diff --git a/tests/unit/providers/test_selector_py2_py3.py b/tests/unit/providers/test_selector_py2_py3.py
@@ -4,7 +4,7 @@
 import itertools
 import sys
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import providers, errors
 
diff --git a/tests/unit/providers/test_singletons_py2_py3.py b/tests/unit/providers/test_singletons_py2_py3.py
@@ -2,7 +2,7 @@
 
 import sys
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     providers,
diff --git a/tests/unit/providers/test_utils_py2_py3.py b/tests/unit/providers/test_utils_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector provider utils unit tests."""
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import (
     providers,
diff --git a/tests/unit/test_common_py2_py3.py b/tests/unit/test_common_py2_py3.py
@@ -1,6 +1,6 @@
 """Dependency injector common unit tests."""
 
-import unittest2 as unittest
+import unittest
 
 from dependency_injector import __version__
 
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,6 @@ envlist=
 
 [testenv]
 deps=
-    unittest2
     # TODO: Hotfix, remove when fixed https://github.com/aio-libs/aiohttp/issues/5107
     typing_extensions
     httpx
@@ -15,7 +14,7 @@ extras=
     flask
     aiohttp
 commands=
-    unit2 discover -s tests/unit -p test_*_py3*.py
+    python -m unittest discover -s tests/unit -p test_*_py3*.py
 
 [testenv:coveralls]
 passenv = GITHUB_* COVERALLS_*
@@ -28,44 +27,40 @@ deps=
     coveralls
 commands=
     coverage erase
-    coverage run --rcfile=./.coveragerc -m unittest2 discover -s tests/unit/ -p test_*_py3*.py
+    coverage run --rcfile=./.coveragerc -m unittest discover -s tests/unit/ -p test_*_py3*.py
     coverage report --rcfile=./.coveragerc
     coveralls
 
 [testenv:2.7]
 deps=
-    unittest2
 extras=
     yaml
     flask
 commands=
-    unit2 discover -s tests/unit -p test_*_py2_py3.py
+    python -m unittest discover -s tests/unit -p test_*_py2_py3.py
 
 [testenv:3.4]
 deps=
-    unittest2
 extras=
     flask
 commands=
-    unit2 discover -s tests/unit -p test_*_py3.py
+    python -m unittest discover -s tests/unit -p test_*_py3.py
 
 [testenv:3.5]
 deps=
-    unittest2
 extras=
     yaml
     flask
 commands=
-    unit2 discover -s tests/unit -p test_*_py3.py
+    python -m unittest discover -s tests/unit -p test_*_py3.py
 
 [testenv:pypy2]
 deps=
-    unittest2
 extras=
     yaml
     flask
 commands=
-    unit2 discover -s tests/unit -p test_*_py2_py3.py
+    python -m unittest discover -s tests/unit -p test_*_py2_py3.py
 
 [testenv:pylint]
 deps=
