Add python3.6 test environment

* Add py36 environment to tox
* Unify dependencies across manual installation and tox
* Mention tox in the docs

docs/contribute.rst

@@ -47,13 +47,16 @@ Or using ``pip``::
 
     $ pip install -e .
 
+To conveniently test vs multiple python versions we also provide a tox file.
+
+
 Building the docs
 =================
 
 If you make changes to the documentation, you should preview your changes
 before committing them::
 
-    $ pip install sphinx
+    $ pip install -r requirements/docs.pip
     $ cd src/pelican/docs
     $ make html
 

requirements/developer.pip

@@ -1,6 +1,3 @@
 -r test.pip
-
-# Development
-flake8
-flake8-import-order
-sphinx==1.4.9
+-r docs.pip
+-r style.pip

requirements/docs.pip

@@ -0,0 +1,2 @@
+sphinx==1.4.9
+sphinx_rtd_theme

requirements/style.pip

@@ -0,0 +1,2 @@
+flake8
+flake8-import-order

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35},docs,flake8
+envlist = py{27,33,34,35,36},docs,flake8
 
 [testenv]
 basepython =
@@ -7,10 +7,11 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 passenv = *
 usedevelop=True
 deps =
-    -rrequirements/developer.pip
+    -rrequirements/test.pip
     nose
     nose-cov
     coveralls
@@ -24,8 +25,7 @@ commands =
 [testenv:docs]
 basepython = python2.7
 deps =
-    sphinx==1.4.9
-    sphinx_rtd_theme
+    -rrequirements/docs.pip
 changedir = docs
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
@@ -37,8 +37,7 @@ import-order-style = cryptography
 [testenv:flake8]
 basepython = python2.7
 deps =
-    flake8 <= 2.4.1
-    git+https://github.com/public/flake8-import-order@2ac7052a4e02b4a8a0125a106d87465a3b9fd688
+    -rrequirements/style.pip
 commands =
     flake8 --version
     flake8 pelican