fix: Molecular Devices SoftMax Pro - update blocks regex to handle trailing whitespace (#1048)

nathan-stender · web-flow · commit ab606f36a576 · 2025-08-01T10:56:48.000-04:00
diff --git a/src/allotropy/parsers/moldev_softmax_pro/softmax_pro_structure.py b/src/allotropy/parsers/moldev_softmax_pro/softmax_pro_structure.py
@@ -34,7 +34,7 @@
     try_non_nan_float_or_none,
 )
 
-BLOCKS_LINE_REGEX = r"^##BLOCKS=\s*(\d+)$"
+BLOCKS_LINE_REGEX = r"^##BLOCKS=\s*(\d+)\s*$"
 END_LINE_REGEX = "~End"
 EXPORT_VERSION = "1.3"
 VALID_NAN_VALUES = ("Masked", "Range?", "Error")
diff --git a/tests/parsers/moldev_softmax_pro/testdata/partial_plate.txt b/tests/parsers/moldev_softmax_pro/testdata/partial_plate.txt
@@ -1,4 +1,4 @@
-##BLOCKS= 1
+##BLOCKS= 1 
 Plate:	Plate1	1.3	PlateFormat	Spectrum	Absorbance	Raw	FALSE	21			525	565	2			1	16	384	1	16
 	Temperature(¡C)	1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20	21	22	23	24
 525	26.2	0.0994	0.0964	0.0967	0.0972	0.095	0.0947	0.0932	0.0936	0.0958	0.0969	0.099	0.1037	0.1302	0.1248	0.1008	0.1006

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`try_non_nan_float_or_none,`
`35`	`35`	`)`
`36`	`36`
`37`		`-BLOCKS_LINE_REGEX = r"^##BLOCKS=\s*(\d+)$"`
	`37`	`+BLOCKS_LINE_REGEX = r"^##BLOCKS=\s(\d+)\s$"`
`38`	`38`	`END_LINE_REGEX = "~End"`
`39`	`39`	`EXPORT_VERSION = "1.3"`
`40`	`40`	`VALID_NAN_VALUES = ("Masked", "Range?", "Error")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-##BLOCKS= 1`
	`1`	`+##BLOCKS= 1`
`2`	`2`	`Plate: Plate1 1.3 PlateFormat Spectrum Absorbance Raw FALSE 21 525 565 2 1 16 384 1 16`
`3`	`3`	`Temperature(¡C) 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24`
`4`	`4`	`525 26.2 0.0994 0.0964 0.0967 0.0972 0.095 0.0947 0.0932 0.0936 0.0958 0.0969 0.099 0.1037 0.1302 0.1248 0.1008 0.1006`