T w testing

.gitignore

@@ -127,3 +127,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+.DS_Store

excelutils/excel_sbol_utils/helpers.py

@@ -2,6 +2,7 @@
 import string
 import rdflib
 from openpyxl.worksheet import cell_range, worksheet
+from openpyxl import load_workbook
 from pathlib import Path
 
 def check_name(nm_to_chck):
@@ -22,6 +23,11 @@ def check_name(nm_to_chck):
         for ltr in nm_to_chck:
             if ord(ltr) == 32:
                 nm_to_chck = nm_to_chck.replace(ltr, "_")
+            elif ord(ltr) == 45:
+                # Allow hyphens to be reinterpreted as underscores
+                nm_to_chck = nm_to_chck.replace(ltr, "_")
+            elif ord(ltr) == 46:
+                nm_to_chck = nm_to_chck.replace(ltr, "_")
             elif ord(ltr) > 122 or ord(ltr) < 48:
                 # 122 is the highest decimal code number
                 # for common latin ltrs or arabic numbers
@@ -124,7 +130,7 @@ def read_variant_table(excel_file: Path) -> tuple[str, str, list[list]]:
     LAST_VARIANT_ROW = 35
 
     print(f'Loading workbook "{excel_file}"')
-    work_book = openpyxl.load_workbook(excel_file, data_only=True)
+    work_book = load_workbook(excel_file, data_only=True)
     sheet = work_book[VARIANTS_SHEET]
 
     # First, get the library name
@@ -133,7 +139,7 @@ def read_variant_table(excel_file: Path) -> tuple[str, str, list[list]]:
 
     # Then get the base sequence
     print('Extracting base sequence')
-    first_aa_column = get_column_number(FIRST_AMINO_ACID_COLUMN)
+    first_aa_column = col_to_num(FIRST_AMINO_ACID_COLUMN)
     last_aa_column = row_ends(sheet, ORIGINAL_AMINO_ACID_ROW, first_aa_column)
     # Get row from sheet and concatenate it into a string
     row_iterator = sheet.iter_rows(min_row=ORIGINAL_AMINO_ACID_ROW, max_row=ORIGINAL_AMINO_ACID_ROW,