Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Roman Mogylatov 2017-10-13 10:31:46 -07:00
commit 5cbaa702e2
3 changed files with 4 additions and 4 deletions

View File

@ -7,8 +7,8 @@ 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`_ follows `Semantic versioning`_
Development version 3.7.0
------------------- -----
- Add ``FactoryAggregate`` provider. - 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()``). delegate (alias of method ``Provider.delegate()``).

View File

@ -1 +1 @@
six>=1.7.0,<=1.11.0 six>=1.7.0,<=1.10.0

View File

@ -1,6 +1,6 @@
"""Dependency injector top-level package.""" """Dependency injector top-level package."""
__version__ = '3.6.1' __version__ = '3.7.0'
"""Version number that follows semantic versioning. """Version number that follows semantic versioning.
:type: str :type: str