Merge remote-tracking branch 'origin/py35-compat'

.travis.yml

@@ -1,8 +1,9 @@
+sudo: false
 language: python
-install:
+install: pip install tox
-  - pip install tox
+script: tox
-script:
+python:
-  - tox
+  - 3.5
 env:
   - TOXENV=coveralls
   - TOXENV=pylint
@@ -13,5 +14,6 @@ env:
   - TOXENV=py32
   - TOXENV=py33
   - TOXENV=py34
+  - TOXENV=py35
   - TOXENV=pypy
   - TOXENV=pypy3

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

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',

tox.ini

@@ -1,21 +1,31 @@
 [tox]
 envlist=
-    dev, coveralls, pylint, flake8, pep257, py26, py27, py32, py33, py34, 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,38 +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:pypy]
-basepython=pypy
-commands=
-    unit2 discover tests []
-
-[testenv:pypy3]
-basepython=pypy3
-commands=
-    unit2 discover tests []