Merge "Update hacking version"

test-requirements.txt

@@ -1 +1 @@
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0

{{cookiecutter.repo_name}}/releasenotes/source/conf.py

@@ -11,9 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Glance Release Notes documentation build configuration file, created by
-# sphinx-quickstart on Tue Nov  3 17:40:50 2015.
-#
+from {{cookiecutter.module_name}} import version as ui_ver
+
 # This file is execfile()d with the current directory set to its
 # containing dir.
 #
@@ -61,7 +60,6 @@ copyright = u'2017, OpenStack Foundation'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-from {{cookiecutter.module_name}} import version as ui_ver
 # The short X.Y version.
 # The full version, including alpha/beta/rc tags.
 release = ui_ver.version_info.release_string()

{{cookiecutter.repo_name}}/test-requirements.txt

@@ -7,7 +7,7 @@
 # be installed in a specific order.
 #
 # Hacking should appear first in case something else depends on pep8
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD

{{cookiecutter.repo_name}}/tox.ini

@@ -33,6 +33,7 @@ basepython = python3
 commands = flake8 {posargs}
 
 [flake8]
+ignore = F405
 exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,node_modules
 max-complexity = 20
 

{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py

@@ -11,19 +11,19 @@
 #    under the License.
 
 # Default to Horizons test settings to avoid any missing keys
-from horizon.test.settings import *  # noqa: F403,H303
-from openstack_dashboard.test.settings import *  # noqa: F403,H303
-
-# pop these keys to avoid log warnings about deprecation
-# update_dashboards will populate them anyway
-HORIZON_CONFIG.pop('dashboards', None)
-HORIZON_CONFIG.pop('default_dashboard', None)
+from horizon.test.settings import *  # noqa
+from openstack_dashboard.test.settings import *  # noqa
 
 # Update the dashboards with {{cookiecutter.module_name}}
 import {{cookiecutter.module_name}}.enabled
 import openstack_dashboard.enabled
 from openstack_dashboard.utils import settings
 
+# pop these keys to avoid log warnings about deprecation
+# update_dashboards will populate them anyway
+HORIZON_CONFIG.pop('dashboards', None)
+HORIZON_CONFIG.pop('default_dashboard', None)
+
 settings.update_dashboards(
     [
         {{cookiecutter.module_name}}.enabled,