rebase off main incase new build system takes a while

Signed-off-by: Max Chesterfield <max.chesterfield@zepben.com>

Author: chestm007

.gitignore

@@ -129,3 +129,5 @@ dmypy.json
 
 /todo.md
 test/resources/test-network-database.txt
+
+*.iml

setup.py

@@ -18,6 +18,7 @@
     "pytest-cov==2.10.1",
     "pytest-asyncio==0.19.0",
     "pytest-timeout==1.4.2",
+    'pytest-subtests==0.14.1',
     "hypothesis==6.56.3",
     "grpcio-testing==1.61.3",
     "pylint==2.14.5",

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

@@ -5,7 +5,7 @@
 import pytest
 from hypothesis import given
 
-from build.lib.zepben.evolve.services.network.tracing.networktrace.operators.network_state_operators import NetworkStateOperators
+from zepben.evolve.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.evolve import Site, TestNetworkBuilder, Equipment, AssignToLvFeeders, LvFeeder