Merge branch 'release/3.14.1' into master

ets-labs · Nov 8, 2018 · 15a3031 · 15a3031
2 parents 62b0f91 + 1f2c626
commit 15a3031
Show file tree

Hide file tree

Showing 8 changed files with 5,238 additions and 10,985 deletions.
diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
@@ -7,6 +7,14 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+3.14.1
+------
+- Fix bug `#208 <https://github.com/ets-labs/python-dependency-injector/issues/208>`_:
+  version ``3.14.0`` hasn't worked on Python 3.5.2 (thanks to
+  `Jeroen Entjes <https://github.com/JeroenEntjes>`_).
+- Remove deprecated ``assertEquals`` from tests.
+- Regenerate C sources using Cython 0.29.
+
 3.14.0
 ------
 - Add ``Coroutine`` provider.

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,4 +1,4 @@
-cython==0.28.5
+cython==0.29
 tox
 unittest2
 coverage

diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py
@@ -1,6 +1,6 @@
 """Dependency injector top-level package."""
 
-__version__ = '3.14.0'
+__version__ = '3.14.1'
 """Version number that follows semantic versioning.
 
 :type: str

diff --git a/src/dependency_injector/containers.c b/src/dependency_injector/containers.c
diff --git a/src/dependency_injector/providers.c b/src/dependency_injector/providers.c
diff --git a/src/dependency_injector/providers.pyx b/src/dependency_injector/providers.pyx
@@ -15,11 +15,11 @@ except ImportError:
     asyncio = None
     _is_coroutine_marker = None
 else:
-    if sys.version_info[0:2] == (3, 4):
-        _is_coroutine_marker = True
-    else:
+    if sys.version_info >= (3, 5, 3):
         import asyncio.coroutines
         _is_coroutine_marker = asyncio.coroutines._is_coroutine
+    else:
+        _is_coroutine_marker = True
 
 
 from .errors import (

diff --git a/tests/unit/providers/test_injections_py2_py3.py b/tests/unit/providers/test_injections_py2_py3.py
@@ -13,7 +13,7 @@ def test_isinstance(self):
 
     def test_get_value_with_not_provider(self):
         injection = providers.PositionalInjection(123)
-        self.assertEquals(injection.get_value(), 123)
+        self.assertEqual(injection.get_value(), 123)
 
     def test_get_value_with_factory(self):
         injection = providers.PositionalInjection(providers.Factory(object))
@@ -61,11 +61,11 @@ def test_isinstance(self):
 
     def test_get_name(self):
         injection = providers.NamedInjection('name', 123)
-        self.assertEquals(injection.get_name(), 'name')
+        self.assertEqual(injection.get_name(), 'name')
 
     def test_get_value_with_not_provider(self):
         injection = providers.NamedInjection('name', 123)
-        self.assertEquals(injection.get_value(), 123)
+        self.assertEqual(injection.get_value(), 123)
 
     def test_get_value_with_factory(self):
         injection = providers.NamedInjection('name',

diff --git a/tests/unit/test_common_py2_py3.py b/tests/unit/test_common_py2_py3.py
@@ -8,4 +8,4 @@
 class VersionTest(unittest.TestCase):
 
     def test_version_follows_semantic_versioning(self):
-        self.assertEquals(len(__version__.split('.')), 3)
+        self.assertEqual(len(__version__.split('.')), 3)