Merge branch 'origin/proposed/3.0' into master3.0.0b1

1 files changed, 120 insertions, 22 deletions

diff --git a/tox.ini b/tox.ini
index 14e2a44..58e7072 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,40 +1,138 @@
 [tox]
-minversion = 1.6
-envlist =
-    py26,py27,py33,py34,py27-flake8,py34-flake8
+minversion=2.3.1
+envlist = py27,py33,py34,py35,flake8
 
 [testenv]
-usedevelop = True
 deps =
     mock
-    nose
+    pytest
 commands =
-    python setup.py test -q
-    python setup.py flake8
-    nosetests flake8.tests._test_warnings
+    py.test {posargs}
 
-[testenv:py27-flake8]
-basepython = python2.7
+[testenv:venv]
 deps =
-    flake8
-commands = flake8 {posargs} flake8/
+    .
+commands = {posargs}
 
-[testenv:py34-flake8]
-basepython = python3.4
+# Linters
+[testenv:flake8]
+skipsdist = true
+skip_install = true
+use_develop = false
 deps =
     flake8
-commands = flake8 {posargs} flake8/
+    flake8-docstrings>=0.2.7
+    flake8-import-order
+commands =
+    flake8 src/flake8/ tests/ setup.py
+
+[testenv:pylint]
+basepython = python3
+skipsdist = true
+skip_install = true
+use_develop = false
+deps =
+    pyflakes
+    pylint
+commands =
+    pylint flake8
+
+[testenv:doc8]
+basepython = python3
+skipsdist = true
+skip_install = true
+use_develop = false
+deps =
+    sphinx
+    doc8
+commands =
+    doc8 docs/source/
+
+[testenv:mypy]
+basepython = python3
+skipsdist = true
+skip_install = true
+use_develop = false
+deps =
+    mypy-lang
+commands =
+    mypy flake8
+
+[testenv:bandit]
+basepython = python3
+skipsdist = true
+skip_install = true
+use_develop = false
+deps =
+    bandit
+commands =
+    bandit -r flake8/ -c .bandit.yml
+
+[testenv:linters]
+basepython = python3
+skipsdist = true
+skip_install = true
+use_develop = false
+deps =
+    {[testenv:flake8]deps}
+    {[testenv:pylint]deps}
+    {[testenv:doc8]deps}
+    {[testenv:bandit]deps}
+commands =
+    {[testenv:flake8]commands}
+    {[testenv:pylint]commands}
+    {[testenv:doc8]commands}
+    {[testenv:bandit]commands}
+
+# Documentation
+[testenv:docs]
+basepython = python3
+deps =
+    -rdocs/source/requirements.txt
+commands =
+    sphinx-build -E -W -c docs/source/ -b html docs/source/ docs/build/html
+
+[testenv:serve-docs]
+basepython = python3
+skipsdist = true
+skip_install = true
+use_develop = false
+changedir = docs/build/html
+deps =
+commands =
+    python -m http.server {posargs}
+
+[testenv:readme]
+deps =
+    readme_renderer
+commands =
+    python setup.py check -r -s
 
 [testenv:release]
-basepython = python2.7
+skipsdist = true
+basepython = python3
+skip_install = true
+use_develop = false
 deps =
-    twine >= 1.5.0
     wheel
+    setuptools
+    twine >= 1.5.0
 commands =
-    python setup.py sdist bdist_wheel
-    twine upload --skip-existing {posargs} dist/*
+    python setup.py -q sdist bdist_wheel
+    twine upload --skip-existing dist/*
 
+# Flake8 Configuration
 [flake8]
-select = E,F,W
-max_line_length = 79
-exclude = .git,.tox,dist,docs,*egg
+# Ignore some flake8-docstrings errors
+# NOTE(sigmavirus24): While we're still using flake8 2.x, this ignore line
+# defaults to selecting all other errors so we do not need select=E,F,W,I,D
+# Once Flake8 3.0 is released and in a good state, we can use both and it will
+# work well \o/
+ignore = D203
+# NOTE(sigmavirus24): Once we release 3.0.0 this exclude option can be specified
+# across multiple lines. Presently it cannot be specified across multiple lines.
+# :-(
+exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,tests/fixtures/
+max-complexity = 10
+import-order-style = google
+application-import-names = flake8