merge with upstream master

2017-12-19 15:18:35 +01:00
parent efb4547a37
commit 197db1003b
85 changed files with 2522 additions and 697 deletions
--- a/helix/calculators/seismic_calculator.py
+++ b/helix/calculators/seismic_calculator.py
@@ -1,6 +1,5 @@
 from math import ceil, floor

-from helix.calculators.subarray_graph import SubarrayGraph
 from helix.calculators.subarray_helper import extract_subarray

 from helix.constants.global_constants import minimum_racking_capacity