Merge branch 'dev' of github.com:johbackm/PySP2 into dev

ARM-DOE · Dec 14, 2023 · a381c0c · a381c0c
2 parents e319298 + ef7e841
commit a381c0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pysp2/io/read_hk.py b/pysp2/io/read_hk.py
@@ -26,8 +26,10 @@ def read_hk_file(file_name):
     hk_df: pandas.DataFrame
         The housekeeping information in a pandas DataFrame
     """
-
-    my_df = act.io.csvfiles.read_csv(file_name, sep="\t")
+    try:
+        my_df = act.io.csvfiles.read_csv(file_name, sep="\t")
+    except AttributeError:
+        my_df = act.io.csv.read_csv(file_name, sep="\t")
     # Parse time from filename
     start_time = pd.Timestamp('1904-01-01')
     my_df = my_df.rename({'index': 'time'}) 

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
 PLATFORMS = "Linux, Windows, OSX"
 MAJOR = 1
 MINOR = 3
-MICRO = 3
+MICRO = 4
 
 #SCRIPTS = glob.glob('scripts/*')
 #TEST_SUITE = 'nose.collector'