From 2e2dfab9b1e241166ee13760411989966eaccf4a Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Sat, 3 Feb 2024 06:38:42 -0800 Subject: [PATCH 1/3] Update version.h Start work on release 4.3.6 Signed-off-by: David P. Chassin --- source/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/version.h b/source/version.h index 483eed1fc..ea676946d 100644 --- a/source/version.h +++ b/source/version.h @@ -11,7 +11,7 @@ #define REV_MAJOR 4 #define REV_MINOR 3 -#define REV_PATCH 5 +#define REV_PATCH 6 #ifdef HAVE_CONFIG_H #include "config.h" From f7495b562ba33592cfbb8bdf630d8a74635fa7cc Mon Sep 17 00:00:00 2001 From: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:21:04 -0800 Subject: [PATCH 2/3] Restore index.html (#168) Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> --- cloud/websites/docs.gridlabd.us/index.html | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/cloud/websites/docs.gridlabd.us/index.html b/cloud/websites/docs.gridlabd.us/index.html index fef43042b..39ca74a46 100644 --- a/cloud/websites/docs.gridlabd.us/index.html +++ b/cloud/websites/docs.gridlabd.us/index.html @@ -1,9 +1,15 @@ - - - - -Redirecting to http://docs.arras-energy.org/index.html?owner=arras-energy&project=gridlabd... - - \ No newline at end of file + + + + From 4834a04e77049496cf516feb89d2915b78a54603 Mon Sep 17 00:00:00 2001 From: Alyona Teyber Date: Fri, 16 Feb 2024 14:37:23 -0800 Subject: [PATCH 3/3] Fixing the artifacts created by XLSX files (#170) Signed-off-by: Alyona Teyber --- converters/xlsx-spida2csv-geodata.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/converters/xlsx-spida2csv-geodata.py b/converters/xlsx-spida2csv-geodata.py index 10a2c39c6..814a49b7a 100644 --- a/converters/xlsx-spida2csv-geodata.py +++ b/converters/xlsx-spida2csv-geodata.py @@ -119,10 +119,13 @@ def convert(input_files, output_file, options={}): # Read all the sheets in the .xlxs file file_extension = input_pole_file.split(".")[-1] if file_extension == 'xlsx': - df = pd.read_excel(input_pole_file, sheet_name=0, usecols=[ - 'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length', - 'AS-IS Class', 'AS-IS Allowable Stress Adjustment', - 'AS-IS Effective Stress Adjustment', 'AS-IS GPS Point'], engine='openpyxl') + df = pd.read_excel(input_pole_file, sheet_name=0, engine='openpyxl') + df.columns = [col.replace("_x0020_", " ") for col in df.columns] + desired_columns = [ + 'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length', + 'AS-IS Class', 'AS-IS Allowable Stress Adjustment', + 'AS-IS Effective Stress Adjustment', 'AS-IS GPS Point'] + df = df[desired_columns] elif file_extension == 'xls': df = pd.read_excel(input_pole_file, sheet_name=0, usecols=[ 'Structure ID', 'AS-IS AGL', 'AS-IS Species', 'AS-IS GLC', 'AS-IS Length',