diff --git a/eos/__init__.py b/eos/__init__.py index d5656646..e6c04dc0 100644 --- a/eos/__init__.py +++ b/eos/__init__.py @@ -39,16 +39,15 @@ from .const.eos import EffectMode from .const.eos import Restriction from .const.eos import State +from .data.cache_handler import JsonCacheHandler from .data.cache_handler.exception import TypeFetchError +from .data.data_handler import JsonDataHandler +from .data.data_handler import SQLiteDataHandler from .data.source import SourceManager from .fit.container.exception import SlotTakenError from .fit.fit import Fit -from .fit.restriction.exception import ValidationError from .fit.helper import DmgProfile from .fit.helper import ResistProfile -from .data.cache_handler import JsonCacheHandler -from .data.data_handler import JsonDataHandler -from .data.data_handler import SQLiteDataHandler from .fit.item import Booster from .fit.item import Character from .fit.item import Charge @@ -57,10 +56,11 @@ from .fit.item import FighterSquad from .fit.item import Implant from .fit.item import ModuleHigh -from .fit.item import ModuleMed from .fit.item import ModuleLow +from .fit.item import ModuleMed from .fit.item import Rig from .fit.item import Ship from .fit.item import Skill from .fit.item import Stance from .fit.item import Subsystem +from .fit.restriction.exception import ValidationError diff --git a/eos/data/cache_handler/__init__.py b/eos/data/cache_handler/__init__.py index 158a918b..bae7e5e8 100644 --- a/eos/data/cache_handler/__init__.py +++ b/eos/data/cache_handler/__init__.py @@ -19,9 +19,4 @@ # ============================================================================== -__all__ = [ - 'JsonCacheHandler' -] - - from .json_cache_handler import JsonCacheHandler diff --git a/eos/data/data_handler/__init__.py b/eos/data/data_handler/__init__.py index f3499739..9fa5644c 100644 --- a/eos/data/data_handler/__init__.py +++ b/eos/data/data_handler/__init__.py @@ -19,11 +19,5 @@ # ============================================================================== -__all__ = [ - 'JsonDataHandler', - 'SQLiteDataHandler' -] - - from .json_data_handler import JsonDataHandler from .sqlite_data_handler import SQLiteDataHandler diff --git a/eos/data/eve_obj_builder/cleaner.py b/eos/data/eve_obj_builder/cleaner.py index 98ecf827..93aedee1 100644 --- a/eos/data/eve_obj_builder/cleaner.py +++ b/eos/data/eve_obj_builder/cleaner.py @@ -19,11 +19,12 @@ # ============================================================================== -import yaml from collections.abc import Iterable from itertools import chain from logging import getLogger +import yaml + from eos.const.eve import AttrId from eos.const.eve import TypeCategoryId from eos.const.eve import TypeGroupId diff --git a/eos/data/eve_obj_builder/normalizer.py b/eos/data/eve_obj_builder/normalizer.py index a81afa3a..86541e18 100644 --- a/eos/data/eve_obj_builder/normalizer.py +++ b/eos/data/eve_obj_builder/normalizer.py @@ -22,8 +22,8 @@ from logging import getLogger from eos.const.eve import AttrId -from eos.const.eve import TypeGroupId from eos.const.eve import OperandId +from eos.const.eve import TypeGroupId from eos.util.frozendict import frozendict diff --git a/eos/data/source.py b/eos/data/source.py index 0c90e498..08c4e104 100644 --- a/eos/data/source.py +++ b/eos/data/source.py @@ -19,8 +19,8 @@ # ============================================================================== -from logging import getLogger from collections import namedtuple +from logging import getLogger from eos import __version__ as eos_version from eos.util.repr import make_repr_str diff --git a/eos/eve_object/custom/ancillary_armor_repairer/effect.py b/eos/eve_object/custom/ancillary_armor_repairer/effect.py index 34a5611f..fee92a2e 100644 --- a/eos/eve_object/custom/ancillary_armor_repairer/effect.py +++ b/eos/eve_object/custom/ancillary_armor_repairer/effect.py @@ -19,13 +19,12 @@ # ============================================================================== -from eos.const.eve import EffectCategoryId from eos.const.eos import EffectBuildStatus from eos.const.eos import EosEffectId +from eos.const.eve import EffectCategoryId from eos.eve_object import EffectFactory from .modifier import AncillaryRepAmountModifier - _paste_effect = None diff --git a/eos/fit/fit.py b/eos/fit/fit.py index d63b09b7..642ac60a 100644 --- a/eos/fit/fit.py +++ b/eos/fit/fit.py @@ -34,12 +34,25 @@ from .container import ItemSet from .container import ModuleRacks from .helper import DmgProfile -from .item import * +from .item import Booster +from .item import Character +from .item import Drone +from .item import EffectBeacon +from .item import FighterSquad +from .item import Implant +from .item import ModuleHigh +from .item import ModuleLow +from .item import ModuleMed +from .item import Rig +from .item import Ship +from .item import Skill +from .item import Stance +from .item import Subsystem from .message import DefaultIncomingDmgChanged from .message.helper import MsgHelper from .misc.volatile import VolatileMgr from .restriction import RestrictionService -from .sim import * +from .sim import ReactiveArmorHardenerSimulator from .stats import StatService diff --git a/eos/fit/item/__init__.py b/eos/fit/item/__init__.py index ceccd51c..81d44e93 100644 --- a/eos/fit/item/__init__.py +++ b/eos/fit/item/__init__.py @@ -19,25 +19,6 @@ # ============================================================================== -__all__ = [ - 'Booster', - 'Character', - 'Charge', - 'Drone', - 'EffectBeacon', - 'FighterSquad', - 'Implant', - 'ModuleHigh', - 'ModuleLow', - 'ModuleMed', - 'Rig', - 'Ship', - 'Skill', - 'Stance', - 'Subsystem' -] - - from .booster import Booster from .character import Character from .charge import Charge diff --git a/eos/fit/item/drone.py b/eos/fit/item/drone.py index b8ad9fb8..b9e4ddcd 100644 --- a/eos/fit/item/drone.py +++ b/eos/fit/item/drone.py @@ -21,8 +21,8 @@ from eos.const.eos import State from eos.util.repr import make_repr_str -from .mixin.dmg_dealer import DmgDealerMixin from .mixin.defeff_proxy import DefaultEffectProxyMixin +from .mixin.dmg_dealer import DmgDealerMixin from .mixin.state import MutableStateMixin from .mixin.tanking import BufferTankingMixin diff --git a/eos/fit/item/fighter_squad.py b/eos/fit/item/fighter_squad.py index 0514ec25..7e01f429 100644 --- a/eos/fit/item/fighter_squad.py +++ b/eos/fit/item/fighter_squad.py @@ -21,8 +21,8 @@ from eos.const.eos import State from eos.util.repr import make_repr_str -from .mixin.dmg_dealer import DmgDealerMixin from .mixin.defeff_proxy import DefaultEffectProxyMixin +from .mixin.dmg_dealer import DmgDealerMixin from .mixin.state import MutableStateMixin from .mixin.tanking import BufferTankingMixin diff --git a/eos/fit/item/module.py b/eos/fit/item/module.py index 16adbc15..3a3ea742 100644 --- a/eos/fit/item/module.py +++ b/eos/fit/item/module.py @@ -24,8 +24,8 @@ from eos.const.eve import AttrId from eos.util.repr import make_repr_str from .mixin.chargeable import ChargeableMixin -from .mixin.dmg_dealer import DmgDealerMixin from .mixin.defeff_proxy import DefaultEffectProxyMixin +from .mixin.dmg_dealer import DmgDealerMixin from .mixin.state import MutableStateMixin diff --git a/eos/fit/restriction/restriction/__init__.py b/eos/fit/restriction/restriction/__init__.py index 92a92e5d..daa65745 100644 --- a/eos/fit/restriction/restriction/__init__.py +++ b/eos/fit/restriction/restriction/__init__.py @@ -19,39 +19,6 @@ # ============================================================================== -__all__ = [ - 'BoosterIndexRestrictionRegister', - 'CalibrationRestriction', - 'CapitalItemRestrictionRegister', - 'CpuRestriction', - 'ChargeGroupRestrictionRegister', - 'ChargeSizeRestrictionRegister', - 'ChargeVolumeRestrictionRegister', - 'DroneBandwidthRestriction', - 'DroneBayVolumeRestriction', - 'DroneGroupRestrictionRegister', - 'HighSlotRestriction', - 'ImplantIndexRestrictionRegister', - 'ItemClassRestrictionRegister', - 'LaunchedDroneRestriction', - 'LauncherSlotRestriction', - 'LowSlotRestriction', - 'MaxGroupActiveRestrictionRegister', - 'MaxGroupFittedRestrictionRegister', - 'MaxGroupOnlineRestrictionRegister', - 'MediumSlotRestriction', - 'PowergridRestriction', - 'RigSizeRestrictionRegister', - 'RigSlotRestriction', - 'ShipTypeGroupRestrictionRegister', - 'SkillRequirementRestrictionRegister', - 'StateRestrictionRegister', - 'SubsystemIndexRestrictionRegister', - 'SubsystemSlotRestriction', - 'TurretSlotRestriction' -] - - from .capital_item import CapitalItemRestrictionRegister from .charge_group import ChargeGroupRestrictionRegister from .charge_size import ChargeSizeRestrictionRegister diff --git a/eos/fit/restriction/restriction/item_class.py b/eos/fit/restriction/restriction/item_class.py index eda1c0c2..e546ed1b 100644 --- a/eos/fit/restriction/restriction/item_class.py +++ b/eos/fit/restriction/restriction/item_class.py @@ -26,7 +26,21 @@ from eos.const.eve import EffectId from eos.const.eve import TypeCategoryId from eos.const.eve import TypeGroupId -from eos.fit.item import * +from eos.fit.item import Booster +from eos.fit.item import Character +from eos.fit.item import Charge +from eos.fit.item import Drone +from eos.fit.item import EffectBeacon +from eos.fit.item import FighterSquad +from eos.fit.item import Implant +from eos.fit.item import ModuleHigh +from eos.fit.item import ModuleLow +from eos.fit.item import ModuleMed +from eos.fit.item import Rig +from eos.fit.item import Ship +from eos.fit.item import Skill +from eos.fit.item import Stance +from eos.fit.item import Subsystem from eos.fit.message import ItemAdded from eos.fit.message import ItemRemoved from .base import BaseRestrictionRegister diff --git a/eos/fit/restriction/service.py b/eos/fit/restriction/service.py index bbf826d2..bf2e7dbc 100644 --- a/eos/fit/restriction/service.py +++ b/eos/fit/restriction/service.py @@ -21,7 +21,35 @@ from .exception import RestrictionValidationError from .exception import ValidationError -from .restriction import * +from .restriction import BoosterIndexRestrictionRegister +from .restriction import CalibrationRestriction +from .restriction import CapitalItemRestrictionRegister +from .restriction import ChargeGroupRestrictionRegister +from .restriction import ChargeSizeRestrictionRegister +from .restriction import ChargeVolumeRestrictionRegister +from .restriction import CpuRestriction +from .restriction import DroneBandwidthRestriction +from .restriction import DroneBayVolumeRestriction +from .restriction import DroneGroupRestrictionRegister +from .restriction import HighSlotRestriction +from .restriction import ImplantIndexRestrictionRegister +from .restriction import ItemClassRestrictionRegister +from .restriction import LaunchedDroneRestriction +from .restriction import LauncherSlotRestriction +from .restriction import LowSlotRestriction +from .restriction import MaxGroupActiveRestrictionRegister +from .restriction import MaxGroupFittedRestrictionRegister +from .restriction import MaxGroupOnlineRestrictionRegister +from .restriction import MediumSlotRestriction +from .restriction import PowergridRestriction +from .restriction import RigSizeRestrictionRegister +from .restriction import RigSlotRestriction +from .restriction import ShipTypeGroupRestrictionRegister +from .restriction import SkillRequirementRestrictionRegister +from .restriction import StateRestrictionRegister +from .restriction import SubsystemIndexRestrictionRegister +from .restriction import SubsystemSlotRestriction +from .restriction import TurretSlotRestriction class RestrictionService: diff --git a/eos/fit/stats/register/__init__.py b/eos/fit/stats/register/__init__.py index 47f537a2..20242239 100644 --- a/eos/fit/stats/register/__init__.py +++ b/eos/fit/stats/register/__init__.py @@ -19,24 +19,6 @@ # ============================================================================== -__all__ = [ - 'CalibrationStatRegister', - 'CpuStatRegister', - 'DmgDealerRegister', - 'DroneBandwidthStatRegister', - 'DronebayVolumeStatRegister', - 'HighSlotStatRegister', - 'LaunchedDroneStatRegister', - 'LauncherSlotStatRegister', - 'LowSlotStatRegister', - 'MediumSlotStatRegister', - 'PowergridStatRegister', - 'RigSlotStatRegister', - 'SubsystemSlotStatRegister', - 'TurretSlotStatRegister' -] - - from .dmg_dealer import DmgDealerRegister from .resource import CalibrationStatRegister from .resource import CpuStatRegister diff --git a/eos/fit/stats/register/dmg_dealer.py b/eos/fit/stats/register/dmg_dealer.py index 2ebcf27a..efa43ade 100644 --- a/eos/fit/stats/register/dmg_dealer.py +++ b/eos/fit/stats/register/dmg_dealer.py @@ -19,16 +19,15 @@ # ============================================================================== +from eos.fit.helper import DmgTypesTotal from eos.fit.item.mixin.dmg_dealer import BASIC_MAP from eos.fit.item.mixin.dmg_dealer import CHARGE_MAP from eos.fit.item.mixin.dmg_dealer import DmgDealerMixin -from eos.fit.helper import DmgTypesTotal from eos.fit.message import EffectsStarted from eos.fit.message import EffectsStopped from eos.util.keyed_storage import KeyedStorage from .base import BaseStatRegister - PRIMARY_DMG_EFFECTS = set(BASIC_MAP).union(CHARGE_MAP) diff --git a/eos/fit/stats/service.py b/eos/fit/stats/service.py index fc64b7a6..32f05943 100644 --- a/eos/fit/stats/service.py +++ b/eos/fit/stats/service.py @@ -31,7 +31,20 @@ from eos.util.pubsub.subscriber import BaseSubscriber from eos.util.volatile_cache import InheritableVolatileMixin from eos.util.volatile_cache import volatile_property -from .register import * +from .register import CalibrationStatRegister +from .register import CpuStatRegister +from .register import DmgDealerRegister +from .register import DroneBandwidthStatRegister +from .register import DronebayVolumeStatRegister +from .register import HighSlotStatRegister +from .register import LaunchedDroneStatRegister +from .register import LauncherSlotStatRegister +from .register import LowSlotStatRegister +from .register import MediumSlotStatRegister +from .register import PowergridStatRegister +from .register import RigSlotStatRegister +from .register import SubsystemSlotStatRegister +from .register import TurretSlotStatRegister class StatService(BaseSubscriber, InheritableVolatileMixin): diff --git a/setup.py b/setup.py index 482020b5..65403f7f 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ from pip.req import parse_requirements -from setuptools import setup from setuptools import find_packages +from setuptools import setup + from eos import __version__ diff --git a/tests/data/test_source.py b/tests/data/test_source.py index 95609ce6..145917bf 100644 --- a/tests/data/test_source.py +++ b/tests/data/test_source.py @@ -19,14 +19,15 @@ # ============================================================================== +from unittest.mock import MagicMock +from unittest.mock import Mock + import pytest from eos import SourceManager -from eos.data.source import Source from eos.data.exception import ExistingSourceError from eos.data.exception import UnknownSourceError -from unittest.mock import MagicMock -from unittest.mock import Mock +from eos.data.source import Source @pytest.fixture diff --git a/tests/integration/calculator/chaining/test_calculation.py b/tests/integration/calculator/chaining/test_calculation.py index 3dbe0f80..38fb46c1 100644 --- a/tests/integration/calculator/chaining/test_calculation.py +++ b/tests/integration/calculator/chaining/test_calculation.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/chaining/test_cleanup_item_addition.py b/tests/integration/calculator/chaining/test_cleanup_item_addition.py index b4ac0954..dc81edec 100644 --- a/tests/integration/calculator/chaining/test_cleanup_item_addition.py +++ b/tests/integration/calculator/chaining/test_cleanup_item_addition.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/chaining/test_cleanup_item_removal.py b/tests/integration/calculator/chaining/test_cleanup_item_removal.py index f149912b..46bf7e90 100644 --- a/tests/integration/calculator/chaining/test_cleanup_item_removal.py +++ b/tests/integration/calculator/chaining/test_cleanup_item_removal.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_cap.py b/tests/integration/calculator/misc/test_cap.py index bb39d1e8..949f0796 100644 --- a/tests/integration/calculator/misc/test_cap.py +++ b/tests/integration/calculator/misc/test_cap.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_effect.py b/tests/integration/calculator/misc/test_effect.py index a102f5be..547192f1 100644 --- a/tests/integration/calculator/misc/test_effect.py +++ b/tests/integration/calculator/misc/test_effect.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_map_methods.py b/tests/integration/calculator/misc/test_map_methods.py index ed058951..2d1f7fcd 100644 --- a/tests/integration/calculator/misc/test_map_methods.py +++ b/tests/integration/calculator/misc/test_map_methods.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Implant from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_mod_python.py b/tests/integration/calculator/misc/test_mod_python.py index 6b774bcb..5c93deed 100644 --- a/tests/integration/calculator/misc/test_mod_python.py +++ b/tests/integration/calculator/misc/test_mod_python.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_non_existent.py b/tests/integration/calculator/misc/test_non_existent.py index d537965a..de6c0a10 100644 --- a/tests/integration/calculator/misc/test_non_existent.py +++ b/tests/integration/calculator/misc/test_non_existent.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Implant from tests.integration.calculator.testcase import CalculatorTestCase diff --git a/tests/integration/calculator/misc/test_rounding.py b/tests/integration/calculator/misc/test_rounding.py index 1261c7d8..aa9b1249 100644 --- a/tests/integration/calculator/misc/test_rounding.py +++ b/tests/integration/calculator/misc/test_rounding.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Implant from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_source_switch.py b/tests/integration/calculator/misc/test_source_switch.py index 9d5b75c8..b5225184 100644 --- a/tests/integration/calculator/misc/test_source_switch.py +++ b/tests/integration/calculator/misc/test_source_switch.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_src_attr.py b/tests/integration/calculator/misc/test_src_attr.py index d3f545c8..18d71457 100644 --- a/tests/integration/calculator/misc/test_src_attr.py +++ b/tests/integration/calculator/misc/test_src_attr.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_state.py b/tests/integration/calculator/misc/test_state.py index 38a8cf09..246788d3 100644 --- a/tests/integration/calculator/misc/test_state.py +++ b/tests/integration/calculator/misc/test_state.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/misc/test_tgt_attr.py b/tests/integration/calculator/misc/test_tgt_attr.py index f922885a..2df48576 100644 --- a/tests/integration/calculator/misc/test_tgt_attr.py +++ b/tests/integration/calculator/misc/test_tgt_attr.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/mixed/test_all_in.py b/tests/integration/calculator/mod_operator/mixed/test_all_in.py index 5fda662e..ae5e0234 100644 --- a/tests/integration/calculator/mod_operator/mixed/test_all_in.py +++ b/tests/integration/calculator/mod_operator/mixed/test_all_in.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/mixed/test_forced.py b/tests/integration/calculator/mod_operator/mixed/test_forced.py index 6d88f763..9069adff 100644 --- a/tests/integration/calculator/mod_operator/mixed/test_forced.py +++ b/tests/integration/calculator/mod_operator/mixed/test_forced.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/penalty_immune/test_category.py b/tests/integration/calculator/mod_operator/penalty_immune/test_category.py index 79dd81c1..f012812e 100644 --- a/tests/integration/calculator/mod_operator/penalty_immune/test_category.py +++ b/tests/integration/calculator/mod_operator/penalty_immune/test_category.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_mod_add.py b/tests/integration/calculator/mod_operator/test_mod_add.py index a9518df9..a8c31a8f 100644 --- a/tests/integration/calculator/mod_operator/test_mod_add.py +++ b/tests/integration/calculator/mod_operator/test_mod_add.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_mod_sub.py b/tests/integration/calculator/mod_operator/test_mod_sub.py index 1819e2f5..5bce417d 100644 --- a/tests/integration/calculator/mod_operator/test_mod_sub.py +++ b/tests/integration/calculator/mod_operator/test_mod_sub.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_post_assign.py b/tests/integration/calculator/mod_operator/test_post_assign.py index bf4ff0e4..e9734b31 100644 --- a/tests/integration/calculator/mod_operator/test_post_assign.py +++ b/tests/integration/calculator/mod_operator/test_post_assign.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_post_div.py b/tests/integration/calculator/mod_operator/test_post_div.py index 24a494c2..7bb5bc36 100644 --- a/tests/integration/calculator/mod_operator/test_post_div.py +++ b/tests/integration/calculator/mod_operator/test_post_div.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_post_mul.py b/tests/integration/calculator/mod_operator/test_post_mul.py index 9b7afdef..26adfbd6 100644 --- a/tests/integration/calculator/mod_operator/test_post_mul.py +++ b/tests/integration/calculator/mod_operator/test_post_mul.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_post_percent.py b/tests/integration/calculator/mod_operator/test_post_percent.py index ccd8455f..138172ed 100644 --- a/tests/integration/calculator/mod_operator/test_post_percent.py +++ b/tests/integration/calculator/mod_operator/test_post_percent.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_pre_assign.py b/tests/integration/calculator/mod_operator/test_pre_assign.py index 85df5e76..64d170e9 100644 --- a/tests/integration/calculator/mod_operator/test_pre_assign.py +++ b/tests/integration/calculator/mod_operator/test_pre_assign.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_pre_div.py b/tests/integration/calculator/mod_operator/test_pre_div.py index baefeb30..1eba3ffa 100644 --- a/tests/integration/calculator/mod_operator/test_pre_div.py +++ b/tests/integration/calculator/mod_operator/test_pre_div.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_pre_mul.py b/tests/integration/calculator/mod_operator/test_pre_mul.py index 08abe404..56710e7f 100644 --- a/tests/integration/calculator/mod_operator/test_pre_mul.py +++ b/tests/integration/calculator/mod_operator/test_pre_mul.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_operator/test_unknown.py b/tests/integration/calculator/mod_operator/test_unknown.py index 275f76b2..d73f6b0d 100644 --- a/tests/integration/calculator/mod_operator/test_unknown.py +++ b/tests/integration/calculator/mod_operator/test_unknown.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/test_tgt_unknown.py b/tests/integration/calculator/mod_tgt_filter/test_tgt_unknown.py index f0301ca3..34f51c8d 100644 --- a/tests/integration/calculator/mod_tgt_filter/test_tgt_unknown.py +++ b/tests/integration/calculator/mod_tgt_filter/test_tgt_unknown.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_character.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_character.py index b84e1489..221e9cb4 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_character.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_character.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_other.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_other.py index 62d50250..b009bf02 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_other.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_other.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_self.py index 864fc9eb..4a4d4121 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_self.py @@ -21,7 +21,10 @@ import logging -from eos import * +from eos import Character +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_ship.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_ship.py index abc5d429..4d39c1b5 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_ship.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_ship.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_target.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_target.py index 752831d7..305a317f 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_target.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_target.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_unknown.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_unknown.py index 55bf0df2..ec609fd6 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_unknown.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain/test_dom_unknown.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_character.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_character.py index c27bf3a2..20477cd3 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_character.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_character.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_other.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_other.py index 7bc430eb..f4ce2685 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_other.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_other.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_self.py index 4111a0ee..9999f915 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_self.py @@ -21,7 +21,10 @@ import logging -from eos import * +from eos import Character +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_ship.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_ship.py index b9bdc483..38b3477e 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_ship.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_ship.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_target.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_target.py index ddf6ae8e..a66b51a8 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_target.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_target.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_unknown.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_unknown.py index 42a4cf80..fd23fe8d 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_unknown.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_group/test_dom_unknown.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_character.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_character.py index db287531..8e7cd569 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_character.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_character.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_other.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_other.py index 0e7d4edf..e8fac06e 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_other.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_other.py @@ -21,7 +21,7 @@ import logging -from eos import * +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_self.py index 9157de34..7fc52e46 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_self.py @@ -21,7 +21,10 @@ import logging -from eos import * +from eos import Character +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_ship.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_ship.py index 62db8656..47a2b33e 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_ship.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_ship.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_target.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_target.py index 76c6aa2b..54403fcb 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_target.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_target.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_unknown.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_unknown.py index 71b8a3d8..5e5d39c0 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_unknown.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_dom_unknown.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_skillrq_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_skillrq_self.py index 4d2fa042..f5010ae5 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_skillrq_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_domain_skillrq/test_skillrq_self.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import EosTypeId from eos.const.eos import ModDomain from eos.const.eos import ModOperator diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_character.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_character.py index 7e58c609..be1fa876 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_character.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_character.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Character +from eos import Implant from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_other.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_other.py index 75699a42..b73b64d8 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_other.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_other.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_ship.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_ship.py index 67f176ea..32802c0c 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_ship.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/awaiting/test_dom_ship.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_character.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_character.py index 9f01dfef..6707fa84 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_character.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_character.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Character +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_other.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_other.py index 354e3b7a..32de4113 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_other.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_other.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_self.py index 28ebebbe..537d4aa4 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_self.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Character +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_ship.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_ship.py index cdd50c9f..ce33b305 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_ship.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_ship.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_target.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_target.py index e3fa5f3c..b9c6009c 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_target.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_target.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_unknown.py b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_unknown.py index ba2a385f..fd9e7306 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_unknown.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_item/test_dom_unknown.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_character.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_character.py index df9ff369..07b33ce7 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_character.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_character.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_other.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_other.py index f0f72435..7070c7b5 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_other.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_other.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_self.py index 18fc24d6..8a2b1b21 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_self.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_ship.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_ship.py index ad040549..ce14d1f3 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_ship.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_ship.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant +from eos import Rig from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_target.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_target.py index 82209ebc..ac912344 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_target.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_target.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_unknown.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_unknown.py index aba685d0..9a5850ef 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_unknown.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_dom_unknown.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import Rig from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter from eos.const.eve import AttrId diff --git a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_skillrq_self.py b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_skillrq_self.py index c2a2833f..e69a8e0f 100644 --- a/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_skillrq_self.py +++ b/tests/integration/calculator/mod_tgt_filter/tgt_owner_skillrq/test_skillrq_self.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant from eos.const.eos import EosTypeId from eos.const.eos import ModDomain from eos.const.eos import ModOperator diff --git a/tests/integration/container/charge/test_charge.py b/tests/integration/container/charge/test_charge.py index 3e69b6d0..4481c126 100644 --- a/tests/integration/container/charge/test_charge.py +++ b/tests/integration/container/charge/test_charge.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import Fit +from eos import ModuleHigh +from eos import Stance +from eos import State from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/direct/test_ship.py b/tests/integration/container/direct/test_ship.py index 7e580ba6..401ae63d 100644 --- a/tests/integration/container/direct/test_ship.py +++ b/tests/integration/container/direct/test_ship.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import Ship +from eos import Stance from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/module_racks/test_module_racks.py b/tests/integration/container/module_racks/test_module_racks.py index f3f95e8e..2024b3e9 100644 --- a/tests/integration/container/module_racks/test_module_racks.py +++ b/tests/integration/container/module_racks/test_module_racks.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh +from eos import ModuleLow +from eos import ModuleMed from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_append.py b/tests/integration/container/ordered/test_append.py index 6ff3edd5..bdb87982 100644 --- a/tests/integration/container/ordered/test_append.py +++ b/tests/integration/container/ordered/test_append.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh +from eos import ModuleMed from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_equip.py b/tests/integration/container/ordered/test_equip.py index b892807e..1e91810f 100644 --- a/tests/integration/container/ordered/test_equip.py +++ b/tests/integration/container/ordered/test_equip.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh +from eos import ModuleMed from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_free.py b/tests/integration/container/ordered/test_free.py index a3f69433..1ca70d5f 100644 --- a/tests/integration/container/ordered/test_free.py +++ b/tests/integration/container/ordered/test_free.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_insert.py b/tests/integration/container/ordered/test_insert.py index 0379ca58..abf0c053 100644 --- a/tests/integration/container/ordered/test_insert.py +++ b/tests/integration/container/ordered/test_insert.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh +from eos import ModuleMed from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_misc.py b/tests/integration/container/ordered/test_misc.py index 0bc3beef..d819d4e5 100644 --- a/tests/integration/container/ordered/test_misc.py +++ b/tests/integration/container/ordered/test_misc.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_place.py b/tests/integration/container/ordered/test_place.py index 7ad1015f..e426a47d 100644 --- a/tests/integration/container/ordered/test_place.py +++ b/tests/integration/container/ordered/test_place.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh +from eos import ModuleMed +from eos import SlotTakenError from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/ordered/test_remove.py b/tests/integration/container/ordered/test_remove.py index c5e48855..b8bb1d5a 100644 --- a/tests/integration/container/ordered/test_remove.py +++ b/tests/integration/container/ordered/test_remove.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/unordered/test_keyed_set.py b/tests/integration/container/unordered/test_keyed_set.py index c077d6db..8205e00f 100644 --- a/tests/integration/container/unordered/test_keyed_set.py +++ b/tests/integration/container/unordered/test_keyed_set.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import Implant +from eos import Skill from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/container/unordered/test_set.py b/tests/integration/container/unordered/test_set.py index 7f3edece..9eb83315 100644 --- a/tests/integration/container/unordered/test_set.py +++ b/tests/integration/container/unordered/test_set.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Fit +from eos import Implant from tests.integration.container.testcase import ContainerTestCase diff --git a/tests/integration/effect_mode/force_run/test_active.py b/tests/integration/effect_mode/force_run/test_active.py index a89b859c..c3f76ff7 100644 --- a/tests/integration/effect_mode/force_run/test_active.py +++ b/tests/integration/effect_mode/force_run/test_active.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_run/test_offline.py b/tests/integration/effect_mode/force_run/test_offline.py index f85be03f..d531dfe2 100644 --- a/tests/integration/effect_mode/force_run/test_offline.py +++ b/tests/integration/effect_mode/force_run/test_offline.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_run/test_online.py b/tests/integration/effect_mode/force_run/test_online.py index 6d968a92..b58c9289 100644 --- a/tests/integration/effect_mode/force_run/test_online.py +++ b/tests/integration/effect_mode/force_run/test_online.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_run/test_overload.py b/tests/integration/effect_mode/force_run/test_overload.py index 88064593..ed19a4ae 100644 --- a/tests/integration/effect_mode/force_run/test_overload.py +++ b/tests/integration/effect_mode/force_run/test_overload.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_stop/test_active.py b/tests/integration/effect_mode/force_stop/test_active.py index 97de975e..b5e1b292 100644 --- a/tests/integration/effect_mode/force_stop/test_active.py +++ b/tests/integration/effect_mode/force_stop/test_active.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_stop/test_offline.py b/tests/integration/effect_mode/force_stop/test_offline.py index 37873c56..0b3ec71c 100644 --- a/tests/integration/effect_mode/force_stop/test_offline.py +++ b/tests/integration/effect_mode/force_stop/test_offline.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_stop/test_online.py b/tests/integration/effect_mode/force_stop/test_online.py index a0d4532a..5e4c7d3a 100644 --- a/tests/integration/effect_mode/force_stop/test_online.py +++ b/tests/integration/effect_mode/force_stop/test_online.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/force_stop/test_overload.py b/tests/integration/effect_mode/force_stop/test_overload.py index 60ed22b4..78faa62b 100644 --- a/tests/integration/effect_mode/force_stop/test_overload.py +++ b/tests/integration/effect_mode/force_stop/test_overload.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/full_compliance/test_active.py b/tests/integration/effect_mode/full_compliance/test_active.py index 5739dd31..1f740de2 100644 --- a/tests/integration/effect_mode/full_compliance/test_active.py +++ b/tests/integration/effect_mode/full_compliance/test_active.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/full_compliance/test_offline.py b/tests/integration/effect_mode/full_compliance/test_offline.py index d53678fa..4db78144 100644 --- a/tests/integration/effect_mode/full_compliance/test_offline.py +++ b/tests/integration/effect_mode/full_compliance/test_offline.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/full_compliance/test_online.py b/tests/integration/effect_mode/full_compliance/test_online.py index bf588114..6f366356 100644 --- a/tests/integration/effect_mode/full_compliance/test_online.py +++ b/tests/integration/effect_mode/full_compliance/test_online.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/full_compliance/test_overload.py b/tests/integration/effect_mode/full_compliance/test_overload.py index 83ba74d3..3776bb04 100644 --- a/tests/integration/effect_mode/full_compliance/test_overload.py +++ b/tests/integration/effect_mode/full_compliance/test_overload.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/misc/test_default.py b/tests/integration/effect_mode/misc/test_default.py index c76d3a7f..067403bf 100644 --- a/tests/integration/effect_mode/misc/test_default.py +++ b/tests/integration/effect_mode/misc/test_default.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/misc/test_error.py b/tests/integration/effect_mode/misc/test_error.py index c7924979..f95a88e7 100644 --- a/tests/integration/effect_mode/misc/test_error.py +++ b/tests/integration/effect_mode/misc/test_error.py @@ -21,7 +21,8 @@ import logging -from eos import * +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/misc/test_item_effect_data.py b/tests/integration/effect_mode/misc/test_item_effect_data.py index 95bdb272..ed806a0b 100644 --- a/tests/integration/effect_mode/misc/test_item_effect_data.py +++ b/tests/integration/effect_mode/misc/test_item_effect_data.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/misc/test_multiset.py b/tests/integration/effect_mode/misc/test_multiset.py index bc2a5e32..f147c8d4 100644 --- a/tests/integration/effect_mode/misc/test_multiset.py +++ b/tests/integration/effect_mode/misc/test_multiset.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/effect_mode/state_compliance/test_active.py b/tests/integration/effect_mode/state_compliance/test_active.py index 770d574b..891902db 100644 --- a/tests/integration/effect_mode/state_compliance/test_active.py +++ b/tests/integration/effect_mode/state_compliance/test_active.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/state_compliance/test_offline.py b/tests/integration/effect_mode/state_compliance/test_offline.py index 992646c8..d7291cd7 100644 --- a/tests/integration/effect_mode/state_compliance/test_offline.py +++ b/tests/integration/effect_mode/state_compliance/test_offline.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/state_compliance/test_online.py b/tests/integration/effect_mode/state_compliance/test_online.py index 13e6cc93..90db7aa7 100644 --- a/tests/integration/effect_mode/state_compliance/test_online.py +++ b/tests/integration/effect_mode/state_compliance/test_online.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/effect_mode/state_compliance/test_overload.py b/tests/integration/effect_mode/state_compliance/test_overload.py index b89c3b2e..ae2dde44 100644 --- a/tests/integration/effect_mode/state_compliance/test_overload.py +++ b/tests/integration/effect_mode/state_compliance/test_overload.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.effect_mode.testcase import EffectModeTestCase diff --git a/tests/integration/item/chargeable/test_charged_cycles.py b/tests/integration/item/chargeable/test_charged_cycles.py index 11a24079..d29af3c0 100644 --- a/tests/integration/item/chargeable/test_charged_cycles.py +++ b/tests/integration/item/chargeable/test_charged_cycles.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import Fit +from eos import ModuleHigh from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/chargeable/test_quantity.py b/tests/integration/item/chargeable/test_quantity.py index 896cb227..c05439cb 100644 --- a/tests/integration/item/chargeable/test_quantity.py +++ b/tests/integration/item/chargeable/test_quantity.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import Fit +from eos import ModuleHigh from eos.const.eve import AttrId from tests.integration.item.testcase import ItemMixinTestCase diff --git a/tests/integration/item/chargeable/test_reload_time.py b/tests/integration/item/chargeable/test_reload_time.py index 3de86de5..c68b7213 100644 --- a/tests/integration/item/chargeable/test_reload_time.py +++ b/tests/integration/item/chargeable/test_reload_time.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/misc/test_nominal_dps.py b/tests/integration/item/damage_dealer/misc/test_nominal_dps.py index f32e2e2e..39949172 100644 --- a/tests/integration/item/damage_dealer/misc/test_nominal_dps.py +++ b/tests/integration/item/damage_dealer/misc/test_nominal_dps.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import Fit +from eos import ModuleHigh +from eos import ResistProfile +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/misc/test_nominal_volley.py b/tests/integration/item/damage_dealer/misc/test_nominal_volley.py index 1757304d..cb9c5df5 100644 --- a/tests/integration/item/damage_dealer/misc/test_nominal_volley.py +++ b/tests/integration/item/damage_dealer/misc/test_nominal_volley.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import Fit +from eos import ModuleHigh +from eos import ResistProfile +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/weapon_type/test_bomb.py b/tests/integration/item/damage_dealer/weapon_type/test_bomb.py index b670304f..e8544168 100644 --- a/tests/integration/item/damage_dealer/weapon_type/test_bomb.py +++ b/tests/integration/item/damage_dealer/weapon_type/test_bomb.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import EffectMode +from eos import Fit +from eos import ModuleHigh +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/weapon_type/test_doomsday.py b/tests/integration/item/damage_dealer/weapon_type/test_doomsday.py index 03d8bd75..1021a8df 100644 --- a/tests/integration/item/damage_dealer/weapon_type/test_doomsday.py +++ b/tests/integration/item/damage_dealer/weapon_type/test_doomsday.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Fit +from eos import ModuleHigh +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/weapon_type/test_drone.py b/tests/integration/item/damage_dealer/weapon_type/test_drone.py index 74bccd68..298d605a 100644 --- a/tests/integration/item/damage_dealer/weapon_type/test_drone.py +++ b/tests/integration/item/damage_dealer/weapon_type/test_drone.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import EffectMode +from eos import Fit +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/weapon_type/test_missile.py b/tests/integration/item/damage_dealer/weapon_type/test_missile.py index db755342..4dafdb20 100644 --- a/tests/integration/item/damage_dealer/weapon_type/test_missile.py +++ b/tests/integration/item/damage_dealer/weapon_type/test_missile.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import EffectMode +from eos import Fit +from eos import ModuleHigh +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/weapon_type/test_smartbomb.py b/tests/integration/item/damage_dealer/weapon_type/test_smartbomb.py index aa0d8c72..d7540625 100644 --- a/tests/integration/item/damage_dealer/weapon_type/test_smartbomb.py +++ b/tests/integration/item/damage_dealer/weapon_type/test_smartbomb.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Fit +from eos import ModuleHigh +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/damage_dealer/weapon_type/test_turret.py b/tests/integration/item/damage_dealer/weapon_type/test_turret.py index 145614f7..4e1933e9 100644 --- a/tests/integration/item/damage_dealer/weapon_type/test_turret.py +++ b/tests/integration/item/damage_dealer/weapon_type/test_turret.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import EffectMode +from eos import Fit +from eos import ModuleHigh +from eos import State from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/item/defeff_proxy/test_defeff_proxy.py b/tests/integration/item/defeff_proxy/test_defeff_proxy.py index 7ff0b67b..2a10f778 100644 --- a/tests/integration/item/defeff_proxy/test_defeff_proxy.py +++ b/tests/integration/item/defeff_proxy/test_defeff_proxy.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import ModuleHigh from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/item/side_effect/test_side_effect.py b/tests/integration/item/side_effect/test_side_effect.py index 5c4c8a09..32d2fdce 100644 --- a/tests/integration/item/side_effect/test_side_effect.py +++ b/tests/integration/item/side_effect/test_side_effect.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Fit from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/item/tanking/test_ehp.py b/tests/integration/item/tanking/test_ehp.py index 5dc36ad4..b32c3f26 100644 --- a/tests/integration/item/tanking/test_ehp.py +++ b/tests/integration/item/tanking/test_ehp.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import DmgProfile +from eos import Fit +from eos import Ship from eos.const.eve import AttrId from tests.integration.item.testcase import ItemMixinTestCase diff --git a/tests/integration/item/tanking/test_hp.py b/tests/integration/item/tanking/test_hp.py index c6002bab..5e2a8d84 100644 --- a/tests/integration/item/tanking/test_hp.py +++ b/tests/integration/item/tanking/test_hp.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import Ship from eos.const.eve import AttrId from tests.integration.item.testcase import ItemMixinTestCase diff --git a/tests/integration/item/tanking/test_resistances.py b/tests/integration/item/tanking/test_resistances.py index c1462431..6c397774 100644 --- a/tests/integration/item/tanking/test_resistances.py +++ b/tests/integration/item/tanking/test_resistances.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import Ship from eos.const.eve import AttrId from tests.integration.item.testcase import ItemMixinTestCase diff --git a/tests/integration/item/tanking/test_worst_case_ehp.py b/tests/integration/item/tanking/test_worst_case_ehp.py index eb76ff4b..280da558 100644 --- a/tests/integration/item/tanking/test_worst_case_ehp.py +++ b/tests/integration/item/tanking/test_worst_case_ehp.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Fit +from eos import Ship from eos.const.eve import AttrId from tests.integration.item.testcase import ItemMixinTestCase diff --git a/tests/integration/restriction/restriction/test_booster_index.py b/tests/integration/restriction/restriction/test_booster_index.py index 910f6ca3..0b3ddd64 100644 --- a/tests/integration/restriction/restriction/test_booster_index.py +++ b/tests/integration/restriction/restriction/test_booster_index.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import ModuleHigh +from eos import Restriction from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_calibration.py b/tests/integration/restriction/restriction/test_calibration.py index 81432eec..1da4b6a0 100644 --- a/tests/integration/restriction/restriction/test_calibration.py +++ b/tests/integration/restriction/restriction/test_calibration.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Restriction +from eos import Rig +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/restriction/restriction/test_capital_item.py b/tests/integration/restriction/restriction/test_capital_item.py index 878215b9..5ad3a39b 100644 --- a/tests/integration/restriction/restriction/test_capital_item.py +++ b/tests/integration/restriction/restriction/test_capital_item.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import Restriction +from eos import Rig +from eos import Ship +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_charge_group.py b/tests/integration/restriction/restriction/test_charge_group.py index 3f8fe5b5..1f5fabc8 100644 --- a/tests/integration/restriction/restriction/test_charge_group.py +++ b/tests/integration/restriction/restriction/test_charge_group.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_charge_size.py b/tests/integration/restriction/restriction/test_charge_size.py index 10980388..b5da3dd3 100644 --- a/tests/integration/restriction/restriction/test_charge_size.py +++ b/tests/integration/restriction/restriction/test_charge_size.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_charge_volume.py b/tests/integration/restriction/restriction/test_charge_volume.py index 7e830ab9..9f23c6d5 100644 --- a/tests/integration/restriction/restriction/test_charge_volume.py +++ b/tests/integration/restriction/restriction/test_charge_volume.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_cpu.py b/tests/integration/restriction/restriction/test_cpu.py index d4b32669..9b88dcaf 100644 --- a/tests/integration/restriction/restriction/test_cpu.py +++ b/tests/integration/restriction/restriction/test_cpu.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Restriction +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/restriction/restriction/test_drone_bandwidth.py b/tests/integration/restriction/restriction/test_drone_bandwidth.py index 8f036571..58894bd7 100644 --- a/tests/integration/restriction/restriction/test_drone_bandwidth.py +++ b/tests/integration/restriction/restriction/test_drone_bandwidth.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Restriction +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/restriction/restriction/test_drone_group.py b/tests/integration/restriction/restriction/test_drone_group.py index c1111eca..386108ed 100644 --- a/tests/integration/restriction/restriction/test_drone_group.py +++ b/tests/integration/restriction/restriction/test_drone_group.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Implant +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_dronebay_volume.py b/tests/integration/restriction/restriction/test_dronebay_volume.py index ec3b01f5..b1ce7bac 100644 --- a/tests/integration/restriction/restriction/test_dronebay_volume.py +++ b/tests/integration/restriction/restriction/test_dronebay_volume.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import ModuleHigh +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_high_slot.py b/tests/integration/restriction/restriction/test_high_slot.py index 0e1f3017..c8975004 100644 --- a/tests/integration/restriction/restriction/test_high_slot.py +++ b/tests/integration/restriction/restriction/test_high_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_implant_index.py b/tests/integration/restriction/restriction/test_implant_index.py index 74defff5..d14bb72f 100644 --- a/tests/integration/restriction/restriction/test_implant_index.py +++ b/tests/integration/restriction/restriction/test_implant_index.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Implant +from eos import ModuleHigh +from eos import Restriction from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_item_class.py b/tests/integration/restriction/restriction/test_item_class.py index 52e0029f..79c9a605 100644 --- a/tests/integration/restriction/restriction/test_item_class.py +++ b/tests/integration/restriction/restriction/test_item_class.py @@ -19,7 +19,23 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Character +from eos import Charge +from eos import Drone +from eos import EffectBeacon +from eos import EffectMode +from eos import FighterSquad +from eos import Implant +from eos import ModuleHigh +from eos import ModuleLow +from eos import ModuleMed +from eos import Restriction +from eos import Rig +from eos import Ship +from eos import Skill +from eos import Stance +from eos import Subsystem from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_launched_drone.py b/tests/integration/restriction/restriction/test_launched_drone.py index 21140d2e..45e42ac5 100644 --- a/tests/integration/restriction/restriction/test_launched_drone.py +++ b/tests/integration/restriction/restriction/test_launched_drone.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Character +from eos import Drone +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_launcher_slot.py b/tests/integration/restriction/restriction/test_launcher_slot.py index 28fae58b..d065a55c 100644 --- a/tests/integration/restriction/restriction/test_launcher_slot.py +++ b/tests/integration/restriction/restriction/test_launcher_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_low_slot.py b/tests/integration/restriction/restriction/test_low_slot.py index 88b73a3d..8b7bf238 100644 --- a/tests/integration/restriction/restriction/test_low_slot.py +++ b/tests/integration/restriction/restriction/test_low_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleLow +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_max_group_active.py b/tests/integration/restriction/restriction/test_max_group_active.py index cc48c9ff..a4526137 100644 --- a/tests/integration/restriction/restriction/test_max_group_active.py +++ b/tests/integration/restriction/restriction/test_max_group_active.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_max_group_fitted.py b/tests/integration/restriction/restriction/test_max_group_fitted.py index a42cbc64..40fcdc04 100644 --- a/tests/integration/restriction/restriction/test_max_group_fitted.py +++ b/tests/integration/restriction/restriction/test_max_group_fitted.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import ModuleHigh +from eos import Restriction from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_max_group_online.py b/tests/integration/restriction/restriction/test_max_group_online.py index 38a1b234..e141717e 100644 --- a/tests/integration/restriction/restriction/test_max_group_online.py +++ b/tests/integration/restriction/restriction/test_max_group_online.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_medium_slot.py b/tests/integration/restriction/restriction/test_medium_slot.py index 7ca2098b..4131683b 100644 --- a/tests/integration/restriction/restriction/test_medium_slot.py +++ b/tests/integration/restriction/restriction/test_medium_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleMed +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_powergrid.py b/tests/integration/restriction/restriction/test_powergrid.py index f9931bc5..fc697c8e 100644 --- a/tests/integration/restriction/restriction/test_powergrid.py +++ b/tests/integration/restriction/restriction/test_powergrid.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Restriction +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/restriction/restriction/test_rig_size.py b/tests/integration/restriction/restriction/test_rig_size.py index 2ad4e5f1..3ad0785c 100644 --- a/tests/integration/restriction/restriction/test_rig_size.py +++ b/tests/integration/restriction/restriction/test_rig_size.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Restriction +from eos import Rig +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_rig_slot.py b/tests/integration/restriction/restriction/test_rig_slot.py index 332c3ff2..ee2842d9 100644 --- a/tests/integration/restriction/restriction/test_rig_slot.py +++ b/tests/integration/restriction/restriction/test_rig_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Restriction +from eos import Rig +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_ship_type_group.py b/tests/integration/restriction/restriction/test_ship_type_group.py index 828107b5..e16c6496 100644 --- a/tests/integration/restriction/restriction/test_ship_type_group.py +++ b/tests/integration/restriction/restriction/test_ship_type_group.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import Restriction +from eos import Rig +from eos import Ship from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_skill_requirement.py b/tests/integration/restriction/restriction/test_skill_requirement.py index 1846b07b..5cf12cf1 100644 --- a/tests/integration/restriction/restriction/test_skill_requirement.py +++ b/tests/integration/restriction/restriction/test_skill_requirement.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import Restriction +from eos import Rig +from eos import Skill from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_state.py b/tests/integration/restriction/restriction/test_state.py index 566f95c8..072a25d2 100644 --- a/tests/integration/restriction/restriction/test_state.py +++ b/tests/integration/restriction/restriction/test_state.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import Restriction +from eos import State from eos.const.eve import EffectCategoryId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_subsystem_index.py b/tests/integration/restriction/restriction/test_subsystem_index.py index 5e71a047..5527c47c 100644 --- a/tests/integration/restriction/restriction/test_subsystem_index.py +++ b/tests/integration/restriction/restriction/test_subsystem_index.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import ModuleHigh +from eos import Restriction +from eos import Subsystem from eos.const.eve import AttrId from tests.integration.restriction.testcase import RestrictionTestCase diff --git a/tests/integration/restriction/restriction/test_subsystem_slot.py b/tests/integration/restriction/restriction/test_subsystem_slot.py index 6b292329..a80034bd 100644 --- a/tests/integration/restriction/restriction/test_subsystem_slot.py +++ b/tests/integration/restriction/restriction/test_subsystem_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Restriction +from eos import Ship +from eos import Subsystem from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/restriction/restriction/test_turret_slot.py b/tests/integration/restriction/restriction/test_turret_slot.py index 953c4230..b5a2ba8a 100644 --- a/tests/integration/restriction/restriction/test_turret_slot.py +++ b/tests/integration/restriction/restriction/test_turret_slot.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Restriction +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/sim/rah/cleanup/test_cleanup.py b/tests/integration/sim/rah/cleanup/test_cleanup.py index 0ada4714..2fe1ae2e 100644 --- a/tests/integration/sim/rah/cleanup/test_cleanup.py +++ b/tests/integration/sim/rah/cleanup/test_cleanup.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import DmgProfile +from eos import ModuleLow +from eos import Ship +from eos import Skill +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/sim/rah/criteria/test_criteria.py b/tests/integration/sim/rah/criteria/test_criteria.py index 1317093a..a0c9b436 100644 --- a/tests/integration/sim/rah/criteria/test_criteria.py +++ b/tests/integration/sim/rah/criteria/test_criteria.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleLow +from eos import Ship +from eos import State from eos.const.eve import EffectId from tests.integration.sim.rah.testcase import RahSimTestCase diff --git a/tests/integration/sim/rah/misc/test_override.py b/tests/integration/sim/rah/misc/test_override.py index edcaaac3..9b83deac 100644 --- a/tests/integration/sim/rah/misc/test_override.py +++ b/tests/integration/sim/rah/misc/test_override.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import ModuleLow +from eos import Ship +from eos import Skill +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/sim/rah/misc/test_source.py b/tests/integration/sim/rah/misc/test_source.py index fa4f1838..c3688c53 100644 --- a/tests/integration/sim/rah/misc/test_source.py +++ b/tests/integration/sim/rah/misc/test_source.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import ModuleLow +from eos import Ship +from eos import State from tests.integration.sim.rah.testcase import RahSimTestCase diff --git a/tests/integration/sim/rah/result/test_result.py b/tests/integration/sim/rah/result/test_result.py index c350f878..3ba69776 100644 --- a/tests/integration/sim/rah/result/test_result.py +++ b/tests/integration/sim/rah/result/test_result.py @@ -22,7 +22,11 @@ import logging from unittest.mock import patch -from eos import * +from eos import DmgProfile +from eos import ModuleLow +from eos import Ship +from eos import Skill +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/source/switch/test_item_class.py b/tests/integration/source/switch/test_item_class.py index 644af78c..e0345398 100644 --- a/tests/integration/source/switch/test_item_class.py +++ b/tests/integration/source/switch/test_item_class.py @@ -19,7 +19,21 @@ # ============================================================================== -from eos import * +from eos import Booster +from eos import Character +from eos import Charge +from eos import Drone +from eos import EffectBeacon +from eos import FighterSquad +from eos import Implant +from eos import ModuleHigh +from eos import ModuleLow +from eos import ModuleMed +from eos import Rig +from eos import Ship +from eos import Skill +from eos import Stance +from eos import Subsystem from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/damage/test_nominal_dps.py b/tests/integration/stats/damage/test_nominal_dps.py index de527fe0..cf303cf7 100644 --- a/tests/integration/stats/damage/test_nominal_dps.py +++ b/tests/integration/stats/damage/test_nominal_dps.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh +from eos import ResistProfile +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/damage/test_nominal_volley.py b/tests/integration/stats/damage/test_nominal_volley.py index 20fb80c9..60a92381 100644 --- a/tests/integration/stats/damage/test_nominal_volley.py +++ b/tests/integration/stats/damage/test_nominal_volley.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import Charge +from eos import ModuleHigh +from eos import ResistProfile +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/resource/test_calibration.py b/tests/integration/stats/resource/test_calibration.py index 271ea58c..6e173d33 100644 --- a/tests/integration/stats/resource/test_calibration.py +++ b/tests/integration/stats/resource/test_calibration.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import Rig +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/stats/resource/test_cpu.py b/tests/integration/stats/resource/test_cpu.py index 9c5d32b6..e6ca6bc6 100644 --- a/tests/integration/stats/resource/test_cpu.py +++ b/tests/integration/stats/resource/test_cpu.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/resource/test_drone_bandwidth.py b/tests/integration/stats/resource/test_drone_bandwidth.py index 7824c98c..d74e442f 100644 --- a/tests/integration/stats/resource/test_drone_bandwidth.py +++ b/tests/integration/stats/resource/test_drone_bandwidth.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/resource/test_dronebay_volume.py b/tests/integration/stats/resource/test_dronebay_volume.py index 520ae1f1..f52b67ab 100644 --- a/tests/integration/stats/resource/test_dronebay_volume.py +++ b/tests/integration/stats/resource/test_dronebay_volume.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import Drone +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/resource/test_powergrid.py b/tests/integration/stats/resource/test_powergrid.py index 8bd44259..009adfe1 100644 --- a/tests/integration/stats/resource/test_powergrid.py +++ b/tests/integration/stats/resource/test_powergrid.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Ship +from eos import State from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/slot/test_high.py b/tests/integration/stats/slot/test_high.py index 27abe139..1a467171 100644 --- a/tests/integration/stats/slot/test_high.py +++ b/tests/integration/stats/slot/test_high.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import ModuleMed +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/slot/test_launched_drone.py b/tests/integration/stats/slot/test_launched_drone.py index 4b41521b..a0df7674 100644 --- a/tests/integration/stats/slot/test_launched_drone.py +++ b/tests/integration/stats/slot/test_launched_drone.py @@ -19,7 +19,11 @@ # ============================================================================== -from eos import * +from eos import Character +from eos import Drone +from eos import ModuleMed +from eos import State +from eos import Subsystem from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/slot/test_launcher.py b/tests/integration/stats/slot/test_launcher.py index 52ce7ee2..6a5961ed 100644 --- a/tests/integration/stats/slot/test_launcher.py +++ b/tests/integration/stats/slot/test_launcher.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/slot/test_low.py b/tests/integration/stats/slot/test_low.py index caaccdc6..ed8151d0 100644 --- a/tests/integration/stats/slot/test_low.py +++ b/tests/integration/stats/slot/test_low.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import ModuleLow +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/slot/test_med.py b/tests/integration/stats/slot/test_med.py index b4a0a8a5..0caf3384 100644 --- a/tests/integration/stats/slot/test_med.py +++ b/tests/integration/stats/slot/test_med.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleLow +from eos import ModuleMed +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/slot/test_rig.py b/tests/integration/stats/slot/test_rig.py index 4633b02c..855b0432 100644 --- a/tests/integration/stats/slot/test_rig.py +++ b/tests/integration/stats/slot/test_rig.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleMed +from eos import Rig +from eos import Ship from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/stats/slot/test_subsystem.py b/tests/integration/stats/slot/test_subsystem.py index 468a7efb..9e8e85a0 100644 --- a/tests/integration/stats/slot/test_subsystem.py +++ b/tests/integration/stats/slot/test_subsystem.py @@ -19,7 +19,10 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleMed +from eos import Ship +from eos import Subsystem from eos.const.eve import AttrId from eos.const.eve import EffectCategoryId from eos.const.eve import EffectId diff --git a/tests/integration/stats/slot/test_turret.py b/tests/integration/stats/slot/test_turret.py index aec13b46..5c2b9402 100644 --- a/tests/integration/stats/slot/test_turret.py +++ b/tests/integration/stats/slot/test_turret.py @@ -19,7 +19,9 @@ # ============================================================================== -from eos import * +from eos import EffectMode +from eos import ModuleHigh +from eos import Ship from eos.const.eos import ModDomain from eos.const.eos import ModOperator from eos.const.eos import ModTgtFilter diff --git a/tests/integration/stats/tanking/test_ehp.py b/tests/integration/stats/tanking/test_ehp.py index a69612e5..c9d8a892 100644 --- a/tests/integration/stats/tanking/test_ehp.py +++ b/tests/integration/stats/tanking/test_ehp.py @@ -19,7 +19,8 @@ # ============================================================================== -from eos import * +from eos import DmgProfile +from eos import Ship from eos.const.eve import AttrId from tests.integration.stats.testcase import StatsTestCase diff --git a/tests/integration/stats/tanking/test_hp.py b/tests/integration/stats/tanking/test_hp.py index b6b4ebf0..101147bc 100644 --- a/tests/integration/stats/tanking/test_hp.py +++ b/tests/integration/stats/tanking/test_hp.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Ship from eos.const.eve import AttrId from tests.integration.stats.testcase import StatsTestCase diff --git a/tests/integration/stats/tanking/test_resists.py b/tests/integration/stats/tanking/test_resists.py index f2495fd6..6fe908a7 100644 --- a/tests/integration/stats/tanking/test_resists.py +++ b/tests/integration/stats/tanking/test_resists.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Ship from eos.const.eve import AttrId from tests.integration.stats.testcase import StatsTestCase diff --git a/tests/integration/stats/tanking/test_worst_case_ehp.py b/tests/integration/stats/tanking/test_worst_case_ehp.py index 4d877bce..8711caf1 100644 --- a/tests/integration/stats/tanking/test_worst_case_ehp.py +++ b/tests/integration/stats/tanking/test_worst_case_ehp.py @@ -19,7 +19,7 @@ # ============================================================================== -from eos import * +from eos import Ship from eos.const.eve import AttrId from tests.integration.stats.testcase import StatsTestCase diff --git a/tests/integration/testcase.py b/tests/integration/testcase.py index ba693d5a..be673d4c 100644 --- a/tests/integration/testcase.py +++ b/tests/integration/testcase.py @@ -27,7 +27,6 @@ from eos.data.source import SourceManager from eos.eve_object import DogmaModifier from tests.testcase import EosTestCase - from .environment import CacheHandler diff --git a/tests/testcase.py b/tests/testcase.py index 09d77002..74425149 100644 --- a/tests/testcase.py +++ b/tests/testcase.py @@ -22,8 +22,8 @@ from collections.abc import Iterable from copy import deepcopy from fnmatch import fnmatchcase -from logging import getLogger from logging import DEBUG +from logging import getLogger from logging.handlers import BufferingHandler from unittest import TestCase from unittest.mock import DEFAULT diff --git a/tox.ini b/tox.ini index 41d1d843..b1425072 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,9 @@ commands = pytest -vv --cov eos tests/ [testenv:pep8] deps = flake8 -commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,.tox,build,dist,__init__.py --ignore=F403,F405 --max-line-length=80 +commands = + flake8 --max-line-length=80 --exclude=.git,__pycache__,venv,.tox,build,dist,__init__.py + flake8 --max-line-length=80 --exclude=.git,__pycache__,venv,.tox,build,dist --ignore=F401 [testenv:single] commands = pytest -vv eos {posargs}