From 8df4058e7c6d0ab06c2884a118bc4885df7ca1a9 Mon Sep 17 00:00:00 2001 From: zssherman Date: Tue, 7 Nov 2023 14:20:19 -0600 Subject: [PATCH 1/2] MNT: Check for ACT syntax changes for ACT v2.0 --- pysp2/io/read_hk.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pysp2/io/read_hk.py b/pysp2/io/read_hk.py index 4c88167..c76d639 100644 --- 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'}) From 339d3f63ea9b91740a3cf704f1d5f59bd24c94c4 Mon Sep 17 00:00:00 2001 From: zssherman Date: Thu, 9 Nov 2023 15:53:15 -0600 Subject: [PATCH 2/2] REL: PySP2 Release Version 1.3.4. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a45def3..c51f78a 100644 --- 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'