Merge "Update hacking version"

doc/source/conf.py

@@ -29,6 +29,8 @@ import sys
 
 import django
 
+from zaqar_ui import version as zaqarui_ver
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
 
@@ -43,8 +45,6 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE',
 # https://docs.djangoproject.com/en/1.8/releases/1.7/#standalone-scripts
 django.setup()
 
-from zaqar_ui import version as zaqarui_ver
-
 # 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.

lower-constraints.txt

@@ -27,7 +27,7 @@ fasteners==0.14.1
 fixtures==3.0.0
 flake8==2.5.5
 futurist==1.6.0
-hacking==0.12.0
+hacking==1.1.0
 horizon==15.0.0.0b1
 idna==2.6
 imagesize==1.0.0

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

tox.ini

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

zaqar_ui/test/settings.py

@@ -11,19 +11,19 @@
 # limitations 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 zaqar_ui
 import openstack_dashboard.enabled
 from openstack_dashboard.utils import settings
 import zaqar_ui.enabled
 
+# 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(
     [
         zaqar_ui.enabled,