From 017634dfcf53179cff3f9af5b67735dabb3ebf7c Mon Sep 17 00:00:00 2001 From: Jrenaud-Desk Date: Mon, 7 Jun 2021 14:12:59 -0400 Subject: [PATCH 1/4] Fixed issue between log reader and Windows pathing --- vplanet/log.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vplanet/log.py b/vplanet/log.py index 7b6b5f7fc..219345ba6 100644 --- a/vplanet/log.py +++ b/vplanet/log.py @@ -299,7 +299,9 @@ def get_log(path=".", sysname=None, ext="log", units=True): # Process the header for i, line in header: try: - name_and_unit, value = line.split(":") + line_items = line.split(":") + name_and_unit = line_items[0] + value = ':'.join(line_items[1:]) unit = get_param_unit(name_and_unit, lf, i) name = get_param_name(name_and_unit, lf, i) value = get_param_value(value, unit, lf, i, units=units) @@ -315,7 +317,9 @@ def get_log(path=".", sysname=None, ext="log", units=True): for i, line in initial: if "BODY:" not in line: try: - name_and_unit, value = line.split(":") + line_items = line.split(":") + name_and_unit = line_items[0] + value = ':'.join(line_items[1:]) unit = get_param_unit(name_and_unit, lf, i) name = get_param_name(name_and_unit, lf, i) value = get_param_value(value, unit, lf, i, units=units) @@ -347,7 +351,9 @@ def get_log(path=".", sysname=None, ext="log", units=True): for i, line in final: if "BODY:" not in line: try: - name_and_unit, value = line.split(":") + line_items = line.split(":") + name_and_unit = line_items[0] + value = ':'.join(line_items[1:]) unit = get_param_unit(name_and_unit, lf, i) name = get_param_name(name_and_unit, lf, i) value = get_param_value(value, unit, lf, i, units=units) From ccb22124b8f2c463430db84f318cbad52d72671b Mon Sep 17 00:00:00 2001 From: Rodrigo Luger Date: Mon, 7 Jun 2021 14:31:56 -0400 Subject: [PATCH 2/4] Update log.py Dummy commit to trigger GitHub Actions --- vplanet/log.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vplanet/log.py b/vplanet/log.py index 219345ba6..f4586c7e3 100644 --- a/vplanet/log.py +++ b/vplanet/log.py @@ -301,7 +301,7 @@ def get_log(path=".", sysname=None, ext="log", units=True): try: line_items = line.split(":") name_and_unit = line_items[0] - value = ':'.join(line_items[1:]) + value = ":".join(line_items[1:]) unit = get_param_unit(name_and_unit, lf, i) name = get_param_name(name_and_unit, lf, i) value = get_param_value(value, unit, lf, i, units=units) @@ -319,7 +319,7 @@ def get_log(path=".", sysname=None, ext="log", units=True): try: line_items = line.split(":") name_and_unit = line_items[0] - value = ':'.join(line_items[1:]) + value = ":".join(line_items[1:]) unit = get_param_unit(name_and_unit, lf, i) name = get_param_name(name_and_unit, lf, i) value = get_param_value(value, unit, lf, i, units=units) @@ -353,7 +353,7 @@ def get_log(path=".", sysname=None, ext="log", units=True): try: line_items = line.split(":") name_and_unit = line_items[0] - value = ':'.join(line_items[1:]) + value = ":".join(line_items[1:]) unit = get_param_unit(name_and_unit, lf, i) name = get_param_name(name_and_unit, lf, i) value = get_param_value(value, unit, lf, i, units=units) From 789f4bc52cf3d119874f2db3479fbcce08c03080 Mon Sep 17 00:00:00 2001 From: Rodrigo Luger Date: Mon, 7 Jun 2021 14:32:40 -0400 Subject: [PATCH 3/4] Update tests.yml Run tests on PRs to dev --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c5d6a71a..9172f546e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: tests on: push: - branches: [master, main] + branches: [master, main, dev] pull_request: - branches: [master, main] + branches: [master, main, dev] jobs: tests: From d9456bcd418d386f77109cd32207018ff605ffd5 Mon Sep 17 00:00:00 2001 From: Rodrigo Luger Date: Mon, 7 Jun 2021 14:33:21 -0400 Subject: [PATCH 4/4] dummy commit... to trigger Github actions --- vplanet/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vplanet/log.py b/vplanet/log.py index f4586c7e3..fa5eec99d 100644 --- a/vplanet/log.py +++ b/vplanet/log.py @@ -49,7 +49,7 @@ def get_param_name(param, file, line): Returns a string. """ - # Replace bad characters + # Replace any bad characters repl = [("#", "")] for a, b in repl: param = param.replace(a, b)