Add flake8, fix it up, refine travis

.flake8

@@ -1,12 +1,16 @@
 [flake8]
-ignore = D203
+ignore =
+    D203,
+    C901
 exclude =
     .git,
     __pycache__,
     epregressions/diffs/math_diff.py,
+    epregressions/diffs/mycsv.py,
     epregressions/diffs/table_diff.py,
+    epregressions/diffs/thresh_dict.py,
     old,
     build,
     dist
 max-complexity = 20
-max-line-length = 120
+max-line-length = 120

.travis.yml

@@ -18,8 +18,20 @@ install:
 - pip install --upgrade pip
 - pip install -r requirements.txt
 
+matrix:
+  include:
+    name: "2.7 Unit Test"
+    python: "2.7"
+    env: TEST_COMMAND=test
+  - name: "3.6 Unit Tests"
+    python: "3.6"
+    env: TEST_COMMAND=test
+  - name: "3.6 Code Quality"
+    python: "3.6"
+    env: TEST_COMMAND=flake8
+
 script:
-- coverage run setup.py test
+- coverage run setup.py $TEST_COMMAND
 
 after_success:
 - coveralls

epregressions/builds/makefile.py

@@ -102,4 +102,3 @@ def get_build_tree(self):
             'weather_dir': os.path.join(self.source_directory, 'weather'),
             'data_sets_dir': os.path.join(self.source_directory, 'datasets')
         }
-

epregressions/main_window.py

@@ -31,7 +31,7 @@
 import gi
 gi.require_version('Gdk', '3.0')  # unfortunately these have to go before the import
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, Gtk, GObject
+from gi.repository import Gdk, Gtk, GObject  # noqa
 
 path = os.path.dirname(__file__)
 script_dir = os.path.abspath(path)
@@ -1542,18 +1542,15 @@ def gui_update_label_for_run_config(self):
         current_config = self.force_run_type
         if current_config == ForceRunType.NONE:
             self.suite_dir_struct_info.set_markup(
-                "A 'Tests' directory will be created in each run directory.\n" +
-                "  Comparison results will be in run directory 1."
+                "A 'Tests' dir will be created in each run directory. Comparison results will be in run dir 1."
             )
         elif current_config == ForceRunType.DD:
             self.suite_dir_struct_info.set_markup(
-                "A 'Tests-DDOnly' directory will be created in each run directory.\n" +  # TODO: Clean this out
-                "  Comparison results will be in run directory 1."
+                "A 'Tests-DDOnly' dir will be created in each run directory. Comparison results will be in run dir 1."
             )
         elif current_config == ForceRunType.ANNUAL:
             self.suite_dir_struct_info.set_markup(
-                "A 'Tests-Annual' directory will be created in each run directory.\n" +
-                "  Comparison results will be in run directory 1."
+                "A 'Tests-Annual' dir will be created in each run directory. Comparison results will be in run dir 1."
             )
         else:
             pass  # gonna go ahead and say this won't happen

epregressions/tests/resources/dummy.energyplus.py

@@ -1,2 +1 @@
 #!/usr/bin/env python
-