From 60f48ab3d987e2aee20b18e8e421677c8b22e5a4 Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Mon, 12 Oct 2015 16:51:03 +0300
Subject: [PATCH 1/5] Add tox commands for running tests on py35

---
 tox.ini | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index eb231416..a9b2d49a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    dev, coveralls, pylint, flake8, pep257, py26, py27, py32, py33, py34, pypy, pypy3
+    dev, coveralls, pylint, flake8, pep257, py26, py27, py32, py33, py34, py35, pypy, pypy3
 
 [testenv]
 deps=
@@ -75,6 +75,11 @@ basepython=python3.4
 commands=
     unit2 discover tests []
 
+[testenv:py35]
+basepython=python3.5
+commands=
+    unit2 discover tests []
+
 [testenv:pypy]
 basepython=pypy
 commands=

From 624e1cef63502388195e558a88bac3357eff2232 Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Mon, 12 Oct 2015 16:53:12 +0300
Subject: [PATCH 2/5] Add travis env variable for running tests on py35

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 21be6868..b1d13044 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ install:
   - pip install tox
 script:
   - tox
+include:
+    - python: 3.5
+      env:
+          - TOXENV=py35
 env:
   - TOXENV=coveralls
   - TOXENV=pylint

From 4237184767b210d25d402461bb9364e3d08d6293 Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Mon, 12 Oct 2015 17:52:30 +0300
Subject: [PATCH 3/5] Add py35 to TOXENVs

---
 .travis.yml | 14 ++++++--------
 tox.ini     | 53 ++++++++++++-----------------------------------------
 2 files changed, 18 insertions(+), 49 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1d13044..48db045a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,9 @@
+sudo: false
 language: python
-install:
-  - pip install tox
-script:
-  - tox
-include:
-    - python: 3.5
-      env:
-          - TOXENV=py35
+install: pip install tox
+script: tox
+python:
+  - 3.5
 env:
   - TOXENV=coveralls
   - TOXENV=pylint
@@ -17,5 +14,6 @@ env:
   - TOXENV=py32
   - TOXENV=py33
   - TOXENV=py34
+  - TOXENV=py35
   - TOXENV=pypy
   - TOXENV=pypy3
diff --git a/tox.ini b/tox.ini
index a9b2d49a..d3d8f7b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,31 @@
 [tox]
 envlist=
-    dev, coveralls, pylint, flake8, pep257, py26, py27, py32, py33, py34, py35, pypy, pypy3
+    coveralls, pylint, flake8, pep257, py26, py27, py32, py33, py34, py35, pypy, pypy3
 
 [testenv]
 deps=
     unittest2
+commands=
+    unit2 discover tests []
 
 [testenv:dev]
 basepython=python2.7
 deps=
     {[testenv]deps}
     coverage
+    flake8
+    pep257
 commands=
     coverage erase
     coverage run --rcfile=./.coveragerc -m unittest2 discover tests []
     coverage html --rcfile=./.coveragerc
 
+    flake8 --max-complexity=8 dependency_injector/
+    flake8 --max-complexity=8 examples/
+
+    pep257 dependency_injector/
+    pep257 examples/
+
 [testenv:coveralls]
 basepython=python2.7
 passenv=TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
@@ -41,6 +51,7 @@ deps=
     flake8
 commands=
     flake8 --max-complexity=8 dependency_injector/
+    flake8 --max-complexity=8 examples/
 
 [testenv:pep257]
 basepython=python2.7
@@ -49,43 +60,3 @@ deps=
 commands=
     pep257 dependency_injector/
     pep257 examples/
-
-[testenv:py26]
-basepython=python2.6
-commands=
-    unit2 discover tests []
-
-[testenv:py27]
-basepython=python2.7
-commands=
-    unit2 discover tests []
-
-[testenv:py32]
-basepython=python3.2
-commands=
-    unit2 discover tests []
-
-[testenv:py33]
-basepython=python3.3
-commands=
-    unit2 discover tests []
-
-[testenv:py34]
-basepython=python3.4
-commands=
-    unit2 discover tests []
-
-[testenv:py35]
-basepython=python3.5
-commands=
-    unit2 discover tests []
-
-[testenv:pypy]
-basepython=pypy
-commands=
-    unit2 discover tests []
-
-[testenv:pypy3]
-basepython=pypy3
-commands=
-    unit2 discover tests []

From 4647bd294511fc36a92fda9dee5acffd5628f8a9 Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Mon, 12 Oct 2015 18:20:20 +0300
Subject: [PATCH 4/5] Add Python 3.5 classifier

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 0862e0f1..ede815c9 100644
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,7 @@ setup(name='dependency_injector',
           'Programming Language :: Python :: 3.2',
           'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Topic :: Software Development',

From b95147b09a94d18549f77eaa66c01eebad30e10f Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Mon, 12 Oct 2015 18:20:46 +0300
Subject: [PATCH 5/5] Add notes about Python 3.5 support into changelog

---
 docs/main/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
index 51108acf..03227ad7 100644
--- a/docs/main/changelog.rst
+++ b/docs/main/changelog.rst
@@ -16,6 +16,7 @@ Development version
 - Add enhancement for ``di.AbstractCatalog`` inheritance.
 - Add images for catalog "Writing catalogs" and "Operating with catalogs" 
   examples.
+- Add support of Python 3.5.
 - Add minor refactorings and code style fixes.
 
 0.9.5