Merge pull request #320 from AdamTheisen/master

ENH: Bug fixes for conda release
ARM-DOE · May 3, 2021 · f6d4cc9 · f6d4cc9
2 parents 00ea525 + 03fbc6c
commit f6d4cc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/act/io/armfiles.py b/act/io/armfiles.py
@@ -186,12 +186,12 @@ def read_netcdf(filenames, concat_dim='time', return_None=False,
     # Get file dates and times that were read in to the object
     filenames.sort()
     for f in filenames:
-        # If Not ARM format, read in first time for info
-        if len(f.split('.')) == 5:
+        # If Not ARM format, read in first time for infos
+        if len(f.split('/')[-1].split('.')) == 5:
             file_dates.append(f.split('.')[-3])
             file_times.append(f.split('.')[-2])
         else:
-            if len(arm_ds['time'].values) > 1:
+            if arm_ds['time'].size > 1:
                 dummy = arm_ds['time'].values[0]
             else:
                 dummy = arm_ds['time'].values

diff --git a/act/tests/test_plotting.py b/act/tests/test_plotting.py
@@ -322,7 +322,7 @@ def test_multi_skewt_plot():
         return skewt.fig
 
 
-@pytest.mark.mpl_image_compare(tolerance=30)
+@pytest.mark.mpl_image_compare(tolerance=31)
 def test_xsection_plot():
     visst_ds = arm.read_netcdf(
         sample_files.EXAMPLE_CEIL1)