diff --git a/lso/__init__.py b/lso/__init__.py index c0a41a15d715f7727515f3d3c6a54c0a1d73da04..e05c6549c648a51d1e5f71f0afda3d9167f8cf4c 100644 --- a/lso/__init__.py +++ b/lso/__init__.py @@ -6,8 +6,7 @@ import logging from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from lso import config -from lso import environment +from lso import config, environment from lso.routes import default, device, ip_trunk diff --git a/lso/environment.py b/lso/environment.py index 04cd634e2d6408b7c18afee0be56ff1366ff2c94..3cab8a89ac92dc6ffcfc471fc24d1a54f71099e6 100644 --- a/lso/environment.py +++ b/lso/environment.py @@ -5,7 +5,6 @@ import json import logging.config import os - LOGGING_DEFAULT_CONFIG = { 'version': 1, 'disable_existing_loggers': False, diff --git a/lso/routes/device.py b/lso/routes/device.py index a7bda43b1d0d61027b8336c843069a2f0d9822e7..cdd4aaa4493d5184552fe489f95eb29ae449a36e 100644 --- a/lso/routes/device.py +++ b/lso/routes/device.py @@ -7,7 +7,7 @@ from typing import Optional from fastapi import APIRouter from pydantic import BaseModel, HttpUrl -from lso import playbook, config +from lso import config, playbook router = APIRouter() config_params = config.load() diff --git a/setup.py b/setup.py index 4f46d3341c7a5bc4b410db712a76c09c86872509..0d385378fb3130b84da0e9c76c17f13d58c84200 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup( name='goat-lso', diff --git a/test/routes/__init__.py b/test/routes/__init__.py index a96b0eb0b4f3ddb3a8451a79196638bb9a239c4d..d9e950da00b8937efa6239639eed0ea75764f862 100644 --- a/test/routes/__init__.py +++ b/test/routes/__init__.py @@ -1,6 +1,5 @@ from typing import TextIO - TEST_CALLBACK_URL = 'https://fqdn.abc.xyz/api/resume' diff --git a/test/routes/test_device.py b/test/routes/test_device.py index 0a0142b2473d82e5a4052f9e8299d7823e6fa574..d342316ac5a3688f6db40e436afc2020429cf686 100644 --- a/test/routes/test_device.py +++ b/test/routes/test_device.py @@ -5,7 +5,7 @@ import jsonschema import responses from lso.playbook import PlaybookLaunchResponse -from test.routes import test_ansible_runner_run, TEST_CALLBACK_URL +from test.routes import TEST_CALLBACK_URL, test_ansible_runner_run @responses.activate diff --git a/test/routes/test_ip_trunk.py b/test/routes/test_ip_trunk.py index 76b24db09e23d08b46a61ee685c0251859862ad8..0e8378cbc5cc3128d129a1e26567c35033ad2fd0 100644 --- a/test/routes/test_ip_trunk.py +++ b/test/routes/test_ip_trunk.py @@ -5,7 +5,7 @@ import jsonschema import responses from lso.playbook import PlaybookLaunchResponse -from test.routes import test_ansible_runner_run, TEST_CALLBACK_URL +from test.routes import TEST_CALLBACK_URL, test_ansible_runner_run _SUBSCRIPTION_OBJECT = { 'subscription_id': '0',