From 1ed0df5e37da4cebb7ed33606656b752ce2a0290 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Fri, 4 Jan 2019 23:26:16 +0800 Subject: [PATCH] Update hacking version Use latest release 1.1.0 Change-Id: I0cac5ed78ea95da34364a67bf4c2763d67cf19eb Co-Authored-By: Shu Muto --- test-requirements.txt | 2 +- .../releasenotes/source/conf.py | 6 ++---- {{cookiecutter.repo_name}}/test-requirements.txt | 2 +- {{cookiecutter.repo_name}}/tox.ini | 1 + .../{{cookiecutter.module_name}}/test/settings.py | 14 +++++++------- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index c3ed418..bab219e 100644 --- a/test-requirements.txt +++ b/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 diff --git a/{{cookiecutter.repo_name}}/releasenotes/source/conf.py b/{{cookiecutter.repo_name}}/releasenotes/source/conf.py index 4377037..68a9057 100644 --- a/{{cookiecutter.repo_name}}/releasenotes/source/conf.py +++ b/{{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() diff --git a/{{cookiecutter.repo_name}}/test-requirements.txt b/{{cookiecutter.repo_name}}/test-requirements.txt index 3fc50ac..d3163df 100644 --- a/{{cookiecutter.repo_name}}/test-requirements.txt +++ b/{{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 diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini index e9bc582..16ee2db 100644 --- a/{{cookiecutter.repo_name}}/tox.ini +++ b/{{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 diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py index 9c40524..d19935b 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py +++ b/{{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,