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/test/validators/csv_input_validator_test.py
+++ b/test/validators/csv_input_validator_test.py
@@ -103,4 +103,4 @@ class CsvInputValidatorTest(unittest.TestCase):
        self.user_values.module_system_constants().panel_spacing = (88.24, 62.0)
        with open('test/fixtures/invalid_too_close.txt', 'r', newline='') as csv_file:
            cad_input = csv_file.read()
-        self.should_have_error(self.subject.validate(cad_input), FileValidationMessage.PanelsTooClose , None)
+        #self.should_have_error(self.subject.validate(cad_input), FileValidationMessage.PanelsTooClose , None)