Skip to content

Commit 91fd8d8

Browse files
committed
FIX/TEST: fixed a bug I inadvertently introduced when updating loaders to work with 12IDE data. Updated tests so that they run automatically with pytest.
1 parent bda3a50 commit 91fd8d8

File tree

6 files changed

+2
-8
lines changed

6 files changed

+2
-8
lines changed

src/pyxalign/io/loaders/utils.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -523,11 +523,5 @@ def count_digits(s):
523523

524524

525525
def extract_s_digit_strings(strings):
526-
return [s for s in strings if re.match("\D+\d+", s)]
527-
# pattern = r"^S\d+$" # Matches 'S' followed by one or more digits
528-
# return [s for s in strings if re.match(pattern, s)]
529-
# if len(folder_strings) > 0:
530-
# return folder_strings
531-
# pattern = r"^fly\d+$"
532-
# folder_strings = [s for s in strings if re.match(pattern, s)]
533-
# return folder_strings
526+
known_suffixes = "(S|fly)"
527+
return [s for s in strings if re.match(rf"^{known_suffixes}\d+$", s)]
File renamed without changes.

tests/full_tests/cSAXS_e18044_LamNI_201907_pre_processing.py renamed to tests/full_tests/test_cSAXS_e18044_LamNI_201907_pre_processing.py

File renamed without changes.

0 commit comments

Comments
 (0)