From 0047e621c69bf50d4a5823313ff43d3354aab34f Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Thu, 12 Dec 2019 05:37:42 +0000 Subject: Rebase to starlingx base so that remove the newton base infraworkload handler Change-Id: Ic5add7fc4c1ccfafeca183290e510047e933ccdb Issue-ID: MULTICLOUD-965 Signed-off-by: Bin Yang --- pike/pike/urls.py | 2 +- pike/tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pike/pike/urls.py b/pike/pike/urls.py index 97fd593d..f07d1861 100644 --- a/pike/pike/urls.py +++ b/pike/pike/urls.py @@ -20,7 +20,7 @@ from django.conf.urls import include, url from pike.registration.views import registration from newton_base.openoapi import tenants from newton_base.resource import capacity -from newton_base.resource import infra_workload +from starlingx_base.resource import infra_workload urlpatterns = [ url(r'^', include('pike.swagger.urls')), diff --git a/pike/tox.ini b/pike/tox.ini index 2dfb66ee..6b2665c4 100644 --- a/pike/tox.ini +++ b/pike/tox.ini @@ -37,14 +37,14 @@ deps = -r{toxinidir}/test-requirements.txt commands = coverage run --branch manage.py test pike - coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30 + coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*,*starlingx_base*, *site-packages*" --fail-under=30 [testenv:pep8] deps=flake8 commands=python3 -m flake8 [testenv:cov] -commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*, *starlingx_base*, *site-packages*" +commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*,*starlingx_base*, *site-packages*" [testenv:pylint] whitelist_externals = bash -- cgit 1.2.3-korg