Merge pull request #74 from csiro-coasts/negative-bounds-argument

Fix an issue with negative coordinates in `bounds_argument`
csiro-coasts · Apr 26, 2023 · a41a375 · a41a375
2 parents e7c90b1 + f6dba2a
commit a41a375
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/releases/development.rst b/docs/releases/development.rst
@@ -2,4 +2,4 @@
 Next release (in development)
 =============================
 
-* ...
+* Fix an issue with negative coordinates in :func:`~emsarray.cli.utils.bounds_argument` (:pr:`74`).
diff --git a/src/emsarray/cli/utils.py b/src/emsarray/cli/utils.py
@@ -248,7 +248,7 @@ def set_verbosity(level: int) -> None:
 
 
 NUMBER = r'\d+(?:_\d+)*'
-DECIMAL = rf'({NUMBER}|{NUMBER}\.|\.{NUMBER}|{NUMBER}\.{NUMBER})'
+DECIMAL = rf'(-?(?:{NUMBER}|{NUMBER}\.|\.{NUMBER}|{NUMBER}\.{NUMBER}))'
 bounds_re = re.compile(r'\s*,\s*'.join([DECIMAL] * 4))
 
 

diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py
@@ -78,8 +78,8 @@ def test_add_verbosity_group(args: List[str], expected: int) -> None:
 
 
 def test_bounds_argument() -> None:
-    expected = box(1.5, .2, 3., 4)
-    actual = utils.bounds_argument("1.5 , .2 , 3.,4")
+    expected = box(1.5, -.2, 3., 4)
+    actual = utils.bounds_argument("1.5 , -.2 , 3.,4")
 
     assert actual.equals(expected)