Merge 1674f96 into 6ded15d

.travis.yml

@@ -19,14 +19,14 @@ install:
 
 matrix:
   include:
-  - name: "2.7 Unit Test"
-    python: "2.7"
+  - name: "Python 2 Unit Test"
+    python: 2.7
     env: TEST_COMMAND=test
-  - name: "3.4 Unit Tests"
-    python: "3.4"
+  - name: "Python 3 Unit Tests"
+    python: 3.6
     env: TEST_COMMAND=test
-  - name: "3.4 Code Quality"
-    python: "3.4"
+  - name: "Python 3 Code Quality"
+    python: 3.6
     env: TEST_COMMAND=flake8
 
 script:

README.md

@@ -24,7 +24,7 @@ These can be rolled upstream into the CI code, but must be done with much more c
 
 This tool is written to be functional on all three major platforms, but Windows and Mac have known issues.
 On Windows the multiprocessing code does not work, causing the runs to be executed serially, which means a long testing time.
-On Mac the results tab is currently not showing the results files, making it fairly useless, at least until I write the results to file, in which case they _could_ be processed externally.
+On Mac there are a number of theme icons missing, causing the results tab to appear to be empty after a run, when in fact the icons are there just not rendered.
 
 In general, this tool works amazingly well on Ubuntu 18.04.
 And it is super easy to set up an EnergyPlus build development environment on Ubuntu.

epregressions/diffs/ci_compare_script.py

@@ -111,6 +111,42 @@ def main_function(file_name, base_dir, mod_dir, base_sha, mod_sha, make_public,
         has_small_diffs = True
         print_message("ERR diffs.")
 
+    if entry.readvars_audit_diffs and (entry.readvars_audit_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("ReadvarsAudit diffs.")
+
+    if entry.edd_diffs and (entry.edd_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("EDD diffs.")
+
+    if entry.wrl_diffs and (entry.wrl_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("WRL diffs.")
+
+    if entry.sln_diffs and (entry.sln_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("SLN diffs.")
+
+    if entry.sci_diffs and (entry.sci_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("SCI diffs.")
+
+    if entry.map_diffs and (entry.map_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("MAP diffs.")
+
+    if entry.dfs_diffs and (entry.dfs_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("DFS diffs.")
+
+    if entry.screen_diffs and (entry.screen_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("SCREEN diffs.")
+
+    if entry.glhe_diffs and (entry.glhe_diffs.diff_type != TextDifferences.EQUAL):
+        has_small_diffs = True
+        print_message("GLHE diffs")
+
     # numeric diff
     if entry.eso_diffs:
         has_diffs, has_small_diffs = process_diffs("ESO", entry.eso_diffs, has_diffs, has_small_diffs)
@@ -143,6 +179,10 @@ def main_function(file_name, base_dir, mod_dir, base_sha, mod_sha, make_public,
     if entry.zsz_diffs:
         has_diffs, has_small_diffs = process_diffs("ZSZ", entry.zsz_diffs, has_diffs, has_small_diffs)
 
+    # numeric diff
+    if entry.json_diffs:
+        has_diffs, has_small_diffs = process_diffs("JSON", entry.json_diffs, has_diffs, has_small_diffs)
+
     if entry.table_diffs:
         if entry.table_diffs.big_diff_count > 0:
             has_diffs = True

epregressions/diffs/mycsv.py

@@ -95,7 +95,7 @@ def ismatrice(mat):
             if type(cell) not in (float, int):
                 if sys.version_info[0] == 2:
                     # I would like to just redefine basestring to str on Python 2 but I don't have time right now
-                    if not isinstance(cell, basestring):  # noqa: F821
+                    if not isinstance(cell, basestring):  # noqa: F821  # pragma: no cover
                         return False
                 else:  # python 3
                     if not isinstance(cell, str):

epregressions/main_window.py

@@ -1179,7 +1179,7 @@ def idf_selection_list(self, widget):  # pragma: no cover - moved core into idf_
             Gtk.ButtonsType.OK_CANCEL, None
         )
         dialog.set_title("Enter list of files to select")
-        dialog.set_markup('Enter file names to select, one per line\nFile extensions are optional')
+        dialog.set_markup('Enter file names to select, one per line with extension')
         scrolled_window = Gtk.ScrolledWindow()
         scrolled_window.set_size_request(400, 400)
         scrolled_window.set_shadow_type(Gtk.ShadowType.ETCHED_IN)