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] 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 []