8000 Merge branch 'release/3.14.1' into master · GrxE/python-dependency-injector@15a3031 · GitHub
[go: up one dir, main page]
Skip to content

Commit 15a3031

Browse files
rmk135rmk135
committed
Merge branch 'release/3.14.1' into master
2 parents 62b0f91 + 1f2c626 commit 15a3031

File tree

8 files changed

+5238
-10985
lines changed

8 files changed

+5238
-10985
lines changed

‎docs/main/changelog.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ that were made in every particular version.
77
From version 0.7.6 *Dependency Injector* framework strictly
88
follows `Semantic versioning`_
99

10+
3.14.1
11+
------
12+
- Fix bug `#208 <https://github.com/ets-labs/python-dependency-injector/issues/208>`_:
13+
version ``3.14.0`` hasn't worked on Python 3.5.2 (thanks to
14+
`Jeroen Entjes <https://github.com/JeroenEntjes>`_).
15+
- Remove deprecated ``assertEquals`` from tests.
16+
- Regenerate C sources using Cython 0.29.
17+
1018
3.14.0
1119
------
1220
- Add ``Coroutine`` provider.

‎requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cython==0.28.5
1+
cython==0.29
22
tox
33
unittest2
44
coverage

‎src/dependency_injector/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Dependency injector top-level package."""
22

3-
__version__ = '3.14.0'
3+
__version__ = '3.14.1'
44
"""Version number that follows semantic versioning.
55
66
:type: str

‎src/dependency_injector/containers.c

Lines changed: 1625 additions & 2262 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/dependency_injector/providers.c

Lines changed: 3596 additions & 8714 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/dependency_injector/providers.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ except ImportError:
1515
asyncio = None
1616
_is_coroutine_marker = None
1717
else:
18-
if sys.version_info[0:2] == (3, 4):
19-
_is_coroutine_marker = True
20-
else:
18+
if sys.version_info >= (3, 5, 3):
2119
import asyncio.coroutines
2220
_is_coroutine_marker = asyncio.coroutines._is_coroutine
21+
else:
22+
_is_coroutine_marker = True
2323

2424

2525
from .errors import (

‎tests/unit/providers/test_injections_py2_py3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def test_isinstance(self):
1313

1414
def test_get_value_with_not_provider(self):
1515
injection = providers.PositionalInjection(123)
16-
self.assertEquals(injection.get_value(), 123)
16+
self.assertEqual(injection.get_value(), 123)
1717

1818
def test_get_value_with_factory(self):
1919
injection = providers.PositionalInjection(providers.Factory(object))
@@ -61,11 +61,11 @@ def test_isinstance(self):
6161

6262
def test_get_name(self):
6363
injection = providers.NamedInjection('name', 123)
64-
self.assertEquals(injection.get_name(), 'name')
64+
self.assertEqual(injection.get_name(), 'name')
6565

6666
def test_get_value_with_not_provider(self):
6767
injection = providers.NamedInjection('name', 123)
68-
self.assertEquals(injection.get_value(), 123)
68+
self.assertEqual(injection.get_value(), 123)
6969

7070
def test_get_value_with_factory(self):
7171
injection = providers.NamedInjection('name',

‎tests/unit/test_common_py2_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
class VersionTest(unittest.TestCase):
99

1010
def test_version_follows_semantic_versioning(self):
11-
self.assertEquals(len(__version__.split('.')), 3)
11+
self.assertEqual(len(__version__.split('.')), 3)

0 commit comments

Comments
 (0)
0