Merge branch 'master' into bandit

Author: Gallaecio

.travis.yml

@@ -8,6 +8,8 @@ matrix:
   include:
     - python: 3.8
       env: TOXENV=security
+    - python: 3.8
+      env: TOXENV=flake8
     - python: 2.7
       env: TOXENV=py27
     - python: pypy

conftest.py

@@ -0,0 +1,8 @@
+def pytest_collection_modifyitems(session, config, items):
+    # Avoid executing tests when executing `--flake8` flag (pytest-flake8)
+    try:
+        from pytest_flake8 import Flake8Item
+        if config.getoption('--flake8'):
+            items[:] = [item for item in items if isinstance(item, Flake8Item)]
+    except ImportError:
+        pass

docs/conf.py

@@ -41,6 +41,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
+    'notfound.extension',
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',

pytest.ini

@@ -1,2 +1,12 @@
 [pytest]
 addopts = --doctest-modules --assert=plain --ignore=setup.py
+flake8-ignore =
+    docs/conf.py E265 E402
+    parsel/csstranslator.py E402 E501
+    parsel/selector.py E126 E305 E501
+    parsel/utils.py E226 E501
+    parsel/xpathfuncs.py E501
+    tests/test_selector.py E124 E127 E128 E231 E265 E303 E501 F811 W293
+    tests/test_selector_csstranslator.py E501
+    tests/test_utils.py E501
+    tests/test_xpathfuncs.py E501

tox.ini

@@ -8,16 +8,25 @@ deps =
 commands = py.test --cov=parsel --cov-report= {posargs:parsel tests}
 
 [testenv:security]
-basepython = python3
+basepython = python3.8
 deps =
     bandit
 commands =
     bandit -r -c .bandit.yml {posargs:parsel}
 
+[testenv:flake8]
+basepython = python3.8
+deps =
+    {[testenv]deps}
+    pytest-flake8
+commands =
+    pytest --flake8
+
 [docs]
 changedir = docs
 deps =
     sphinx
+    sphinx-notfound-page
     sphinx_rtd_theme
 
 [testenv:docs]