Merge branch 'master' into pylint

Author: Gallaecio

.bandit.yml

@@ -0,0 +1,3 @@
+skips:
+- B101
+- B107

.travis.yml

@@ -2,7 +2,9 @@ language: python
 sudo: false
 matrix:
   include:
-    - python: 3.7
+    - python: 3.8
+      env: TOXENV=security
+    - python: 3.8
       env: TOXENV=pylint
     - python: 2.7
       env: TOXENV=py27

docs/conf.py

@@ -26,6 +26,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.doctest',
     'sphinx.ext.intersphinx',
@@ -248,7 +249,10 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/3', None),
+    'tox': ('https://tox.readthedocs.io/en/latest', None),
+}
 
 
 # --- Nitpicking options ------------------------------------------------------

docs/index.rst

@@ -42,12 +42,11 @@ Tests
 `pytest`_ is the preferred way to run tests. Just run: ``pytest`` from the
 root directory to execute tests using the default Python interpreter.
 
-`tox`_ could be used to run tests for all supported Python versions.
-Install it (using 'pip install tox') and then run ``tox`` from
+:doc:`tox <tox:index>` could be used to run tests for all supported Python
+versions. Install it (using 'pip install tox') and then run ``tox`` from
 the root directory - tests will be executed for all available
 Python interpreters.
 
-.. _tox: http://tox.testrun.org
 .. _pytest: https://docs.pytest.org/en/latest/
 
 

docs/requirements.txt

@@ -0,0 +1,3 @@
+sphinx
+sphinx-notfound-page
+sphinx_rtd_theme

tox.ini

@@ -16,8 +16,13 @@ commands =
         --cov=w3lib --cov-report=term \
         {posargs:w3lib tests}
 
+[testenv:security]
+deps =
+    bandit
+commands =
+    bandit -r -c .bandit.yml {posargs:w3lib}
+
 [testenv:pylint]
-basepython = python3.7
 deps =
     {[testenv]deps}
     pylint
@@ -26,9 +31,7 @@ commands =
 
 [docs]
 changedir = docs
-deps =
-    sphinx
-    sphinx_rtd_theme
+deps = -rdocs/requirements.txt
 
 [testenv:docs]
 changedir = {[docs]changedir}