From 923b4148d86c04adb82642470141ee1c51da9641 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Fri, 12 Nov 2021 19:43:06 +0000
Subject: [PATCH] updated CHANGELOG for HPC fix a few typos in the units
---
CHANGELOG | 6 ++++++
binarycpython/utils/functions.py | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d8c9186de..b0ba123c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,3 +29,9 @@ https://keepachangelog.com/en/0.3.0/
- dictionary utility functions put into dicts.py
- some new functions to parse recursively dict keys and/or values that are faster than David's, but probably not as flexible. When these are all you need, they're more efficient.
- added a few new Jupyter notebooks
+
+feature/HPC:
+- added Slurm support
+- Fixed JSON load(s) to not convert to ASCII hence preserve UTF-8 and hopefully be faster.
+- Made sure file loads/saves use UTF-8
+- Fixed version dict to include units section and cleaned up a few other unit handlers
diff --git a/binarycpython/utils/functions.py b/binarycpython/utils/functions.py
index ad6dce198..586a45211 100644
--- a/binarycpython/utils/functions.py
+++ b/binarycpython/utils/functions.py
@@ -668,7 +668,7 @@ def parse_binary_c_version_info(version_info_string: str) -> dict:
network_split_info_extra[1].strip().replace("implemented in", "")
)
if implementation:
- network_dict["implemented_in"] = implementation.strip().split()
+ network_dict["implemented_in"] = [i.strip("()") for i in implementation.strip().split()]
networks_dict[network_number] = copy.deepcopy(network_dict)
version_info_dict["networks"] = networks_dict if networks_dict else None
@@ -875,7 +875,7 @@ def parse_binary_c_version_info(version_info_string: str) -> dict:
code_units = split_info[2].split()
code_unit_type_num = int(code_units[3].strip().strip("\""))
code_unit_type = code_units[4].strip().strip("\"")
- code_unit_cgs_value = code_units[9].strip().strip("\"")
+ code_unit_cgs_value = code_units[9].strip().strip("\"").strip(")")
units_dict[long] = {
"long" : long,
"short" : short,
--
GitLab