fix(api, shared-data): Regular expression used to split well into row…

… and column did not allow a 0 column. (#7566) closes #7531
Opentrons · Mar 30, 2021 · 1f6b11b · 1f6b11b
1 parent be091a3
commit 1f6b11b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/tests/opentrons/protocols/context/test_well.py b/api/tests/opentrons/protocols/context/test_well.py
@@ -7,6 +7,8 @@
                              ["A1", "A", "1"],
                              ["A10", "A", "10"],
                              ["Z100", "Z", "100"],
+                             ["A0", "A", "0"],
+                             ["B0100", "B", "0100"]
                          ])
 def test_row_column(name, row, col):
     w = WellImplementation(None, None, None, name=name)
@@ -17,11 +19,9 @@ def test_row_column(name, row, col):
 
 @pytest.mark.parametrize(argnames=["name"],
                          argvalues=[
-                             ["A0"],
                              ["a1"],
                              ["Aa1"],
                              ["A 1"],
-                             ["A0100"]
                          ])
 def test_row_column_fail(name):
     with pytest.raises(AssertionError, match=f"could not match '{name}'"):

diff --git a/shared-data/python/opentrons_shared_data/labware/constants.py b/shared-data/python/opentrons_shared_data/labware/constants.py
@@ -3,4 +3,4 @@
 
 # Regular expression to validate and extract row, column from well name
 # (ie A3, C1)
-WELL_NAME_PATTERN: Final[str] = r'^([A-Z]+)([1-9][0-9]*)$'
+WELL_NAME_PATTERN: Final[str] = r'^([A-Z]+)([0-9]+)$'