From d511e44b1a2b0e70236831926d86a10d589e9235 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Wed, 16 Nov 2022 04:16:01 +0300 Subject: qc: Allow whole numbers or numbers where the decimals are all zeroes --- quality_control/average.py | 4 ++-- quality_control/standard_error.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'quality_control') diff --git a/quality_control/average.py b/quality_control/average.py index 2b098db..ad732d0 100644 --- a/quality_control/average.py +++ b/quality_control/average.py @@ -9,8 +9,8 @@ def invalid_value(line_number: int, column_number: int, val: str) -> Union[ """Return an `InvalidValue` object if `val` is not a valid "averages" value.""" return cell_error( - r"^[0-9]+\.[0-9]{3}$", val, line=line_number, column=column_number, - value=val, message=( + r"^([0-9]+\.[0-9]{3}|[0-9]+\.?0*)$", val, line=line_number, + column=column_number, value=val, message=( f"Invalid value '{val}'. " "Expected string representing a number with exactly three " "decimal places.")) diff --git a/quality_control/standard_error.py b/quality_control/standard_error.py index 7e059ad..90beb8a 100644 --- a/quality_control/standard_error.py +++ b/quality_control/standard_error.py @@ -13,8 +13,8 @@ def invalid_value( `None`. """ return cell_error( - r"^[0-9]+\.[0-9]{6,}$", val, line=line_number, column=column_number, - value=val, message=( + r"^([0-9]+\.[0-9]{6,}|[0-9]+\.?0*)$", val, line=line_number, + column=column_number, value=val, message=( f"Invalid value '{val}'. " "Expected string representing a number with at least six " "decimal places.")) -- cgit v1.2.3