Fix imports

test/cim/iec61968/infiec61968/infcommon/test_ratio.py

@@ -3,7 +3,7 @@
 #  License, v. 2.0. If a copy of the MPL was not distributed with this
 #  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-from _pytest.python_api import raises
+from pytest import raises
 from hypothesis import given
 from hypothesis.strategies import floats
 

test/cim/iec61970/base/core/test_site.py

@@ -5,10 +5,9 @@
 import pytest
 from hypothesis import given
 
-from zepben.ewb.services.network.tracing.networktrace.operators.network_state_operators import NetworkStateOperators
 from cim.iec61970.base.core.test_equipment_container import equipment_container_kwargs, verify_equipment_container_constructor_default, \
     verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args, equipment_container_args
-from zepben.ewb import Site, TestNetworkBuilder, Equipment, AssignToLvFeeders, LvFeeder
+from zepben.ewb import Site, TestNetworkBuilder, Equipment, AssignToLvFeeders, LvFeeder, NetworkStateOperators
 
 site_kwargs = equipment_container_kwargs
 site_args = equipment_container_args

test/cim/iec61970/base/protection/test_relay_setting.py

@@ -2,7 +2,7 @@
 #  This Source Code Form is subject to the terms of the Mozilla Public
 #  License, v. 2.0. If a copy of the MPL was not distributed with this
 #  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-from _pytest.python_api import raises
+from pytest import raises
 
 from zepben.ewb import RelaySetting, UnitSymbol
 

test/cim/iec61970/base/wires/test_power_electronics_connection.py

@@ -4,7 +4,7 @@
 #  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 import re
 
-from _pytest.python_api import raises
+from pytest import raises
 from hypothesis import given
 from hypothesis.strategies import integers, builds, lists, floats, text, booleans
 from zepben.ewb import PowerElectronicsUnit, BatteryUnit, PowerElectronicsConnection

test/cim/iec61970/base/wires/test_power_transformer_end.py

@@ -5,7 +5,7 @@
 import re
 
 import pytest
-from _pytest.python_api import raises
+from pytest import raises
 from hypothesis import given
 from hypothesis.strategies import builds, integers, floats, sampled_from
 from zepben.ewb import PowerTransformerEnd, PowerTransformer, WindingConnection, TransformerCoolingType

test/cim/iec61970/base/wires/test_transformer_end.py

@@ -2,7 +2,7 @@
 #  This Source Code Form is subject to the terms of the Mozilla Public
 #  License, v. 2.0. If a copy of the MPL was not distributed with this
 #  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-from _pytest.python_api import raises
+from pytest import raises
 from hypothesis.strategies import floats, booleans, builds, integers
 from zepben.ewb import Terminal, BaseVoltage, TransformerStarImpedance, PowerTransformer, Fuse
 from zepben.ewb.model.cim.iec61970.base.wires.transformer_end import TransformerEnd

test/database/paths/test_ewb_data_file_paths.py

@@ -7,7 +7,7 @@
 from typing import Iterator
 from unittest.mock import Mock
 
-from _pytest.python_api import raises
+from pytest import raises
 
 from zepben.ewb import EwbDataFilePaths, DatabaseType
 

test/services/network/tracing/traversal/test_step_action.py

@@ -2,7 +2,7 @@
 #  This Source Code Form is subject to the terms of the Mozilla Public
 #  License, v. 2.0. If a copy of the MPL was not distributed with this
 #  file, You can obtain one at https://mozilla.org/MPL/2.0/.
-from _pytest.python_api import raises
+from pytest import raises
 
 from zepben.ewb import StepAction, StepContext
 from zepben.ewb.services.network.tracing.traversal.step_action import T