Upgrade hacking fixed conf.py linting

One conf.py was failing to pass falke8 and the other one was excluded.
Removed exclusion and fixed these filex as this is a more future proof
approach.

Before this change a clean clone of this repository would have failed
on `tox -e pep8`.

Change-Id: Ib8337aa6129acb515e33846c0635b582d1eedb8b

deploy-guide/source/conf.py

@@ -1,7 +1,8 @@
 # instack-undercloud documentation build configuration file, created by
 # sphinx-quickstart on Wed Feb 25 10:56:57 2015.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing
+# dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -9,14 +10,15 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+# import os
+# import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
@@ -68,7 +70,8 @@ release = '3.0.0'
 # directories to ignore when looking for source files.
 exclude_patterns = []
 
-# The reST default role (used for this markup: `text`) to use for all documents.
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
 # default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -89,7 +92,7 @@ pygments_style = 'sphinx'
 # modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output -------------------------------------------------
 
 html_static_path = ['../../_custom']
 # html_style = 'custom.css'
@@ -102,7 +105,7 @@ htmlhelp_basename = '%sdoc' % project
 # a list of builtin themes.
 html_theme = 'openstackdocs'
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output ------------------------------------------------
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').

doc/source/conf.py

@@ -1,7 +1,8 @@
 # instack-undercloud documentation build configuration file, created by
 # sphinx-quickstart on Wed Feb 25 10:56:57 2015.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing
+# dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -9,14 +10,15 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+# import os
+# import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
@@ -68,7 +70,8 @@ release = '3.0.0'
 # directories to ignore when looking for source files.
 exclude_patterns = []
 
-# The reST default role (used for this markup: `text`) to use for all documents.
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
 # default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -89,7 +92,7 @@ pygments_style = 'sphinx'
 # modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output -------------------------------------------------
 
 html_static_path = ['../../_custom']
 # html_style = 'custom.css'
@@ -102,7 +105,7 @@ htmlhelp_basename = '%sdoc' % project
 # a list of builtin themes.
 html_theme = 'openstackdocs'
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output ------------------------------------------------
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').

test-requirements.txt

@@ -5,7 +5,7 @@
 sphinx>=1.6.2 # BSD
 sphinx_rtd_theme==0.1.7
 
-hacking<0.11,>=0.10.0
+hacking<1.2.0,>=1.1.0
 
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD

tox.ini

@@ -28,7 +28,7 @@ commands = flake8
 
 [flake8]
 show-source = True
-exclude = .tox,dist,doc,*.egg,build
+exclude = .tox,dist,*.egg,build
 
 [testenv:deploy-guide]
 basepython = python3