From 2567226c22f51b8196686cd98539aa6b93d92a45 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Tue, 11 Feb 2025 12:52:02 -0500 Subject: [PATCH 1/4] update --- pyproject.toml | 5 - .../testsuite/test_t_register_raster.py | 162 +++++++----------- .../test_t_register_raster_different_local.py | 12 +- .../testsuite/test_t_register_raster_file.py | 114 ++++-------- .../test_t_register_raster_mapmetadata.py | 18 +- 5 files changed, 100 insertions(+), 211 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 38afe3cbcb6..f91a5a6afab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -384,11 +384,6 @@ ignore = [ "temporal/t.rast.colors/t.rast.colors.py" = ["SIM115"] "temporal/t.rast.series/t.rast.series.py" = ["SIM115"] "temporal/t.rast.what/t.rast.what.py" = ["SIM115"] -"temporal/t.register/testsu*/*_raster_different_local.py" = ["FLY002"] -"temporal/t.register/testsu*/*_raster_mapmetadata.py" = ["FLY002"] -"temporal/t.register/testsuite/test_t_register_raster.py" = ["FLY002"] -"temporal/t.register/testsuite/test_t_register_raster_file.py" = ["FLY002"] -"temporal/t.remove/t.remove.py" = ["SIM115"] "vector/v.fill.holes/examples.ipynb" = ["PTH201"] [tool.ruff.lint.flake8-import-conventions.extend-aliases] diff --git a/temporal/t.register/testsuite/test_t_register_raster.py b/temporal/t.register/testsuite/test_t_register_raster.py index a2eee37498b..6df0b4ad3b8 100755 --- a/temporal/t.register/testsuite/test_t_register_raster.py +++ b/temporal/t.register/testsuite/test_t_register_raster.py @@ -110,17 +110,13 @@ def test_with_second_increment_and_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2001-01-01 00:00:01", - "prec_2|...|2001-01-01 00:00:01|2001-01-01 00:00:02", - "prec_3|...|2001-01-01 00:00:02|2001-01-01 00:00:03", - "prec_4|...|2001-01-01 00:00:03|2001-01-01 00:00:04", - "prec_5|...|2001-01-01 00:00:04|2001-01-01 00:00:05", - "prec_6|...|2001-01-01 00:00:05|2001-01-01 00:00:06", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|2001-01-01 00:00:01... +prec_2|...|2001-01-01 00:00:01|2001-01-01 00:00:02... +prec_3|...|2001-01-01 00:00:02|2001-01-01 00:00:03... +prec_4|...|2001-01-01 00:00:03|2001-01-01 00:00:04... +prec_5|...|2001-01-01 00:00:04|2001-01-01 00:00:05... +prec_6|...|2001-01-01 00:00:05|2001-01-01 00:00:06""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_minutes_seconds_increment_and_intervall(self): @@ -150,17 +146,13 @@ def test_with_minutes_seconds_increment_and_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2001-01-01 00:05:20", - "prec_2|...|2001-01-01 00:05:20|2001-01-01 00:10:40", - "prec_3|...|2001-01-01 00:10:40|2001-01-01 00:16:00", - "prec_4|...|2001-01-01 00:16:00|2001-01-01 00:21:20", - "prec_5|...|2001-01-01 00:21:20|2001-01-01 00:26:40", - "prec_6|...|2001-01-01 00:26:40|2001-01-01 00:32:00", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|2001-01-01 00:05:20... +prec_2|...|2001-01-01 00:05:20|2001-01-01 00:10:40... +prec_3|...|2001-01-01 00:10:40|2001-01-01 00:16:00... +prec_4|...|2001-01-01 00:16:00|2001-01-01 00:21:20... +prec_5|...|2001-01-01 00:21:20|2001-01-01 00:26:40... +prec_6|...|2001-01-01 00:26:40|2001-01-01 00:32:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_hours_increment_and_intervall(self): @@ -191,17 +183,13 @@ def test_with_hours_increment_and_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "\n".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2001-01-01 08:00:00", - "prec_2|...|2001-01-01 08:00:00|2001-01-01 16:00:00", - "prec_3|...|2001-01-01 16:00:00|2001-01-02 00:00:00", - "prec_4|...|2001-01-02 00:00:00|2001-01-02 08:00:00", - "prec_5|...|2001-01-02 08:00:00|2001-01-02 16:00:00", - "prec_6|...|2001-01-02 16:00:00|2001-01-03 00:00:00", - ] - ) + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2001-01-01 08:00:00 +prec_2|...|2001-01-01 08:00:00|2001-01-01 16:00:00 +prec_3|...|2001-01-01 16:00:00|2001-01-02 00:00:00 +prec_4|...|2001-01-02 00:00:00|2001-01-02 08:00:00 +prec_5|...|2001-01-02 08:00:00|2001-01-02 16:00:00 +prec_6|...|2001-01-02 16:00:00|2001-01-03 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_days_increment_and_no_intervall(self): @@ -230,17 +218,13 @@ def test_with_days_increment_and_no_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2001-01-04 00:00:00|None", - "prec_3|...|2001-01-07 00:00:00|None", - "prec_4|...|2001-01-10 00:00:00|None", - "prec_5|...|2001-01-13 00:00:00|None", - "prec_6|...|2001-01-16 00:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|None... +prec_2|...|2001-01-04 00:00:00|None... +prec_3|...|2001-01-07 00:00:00|None... +prec_4|...|2001-01-10 00:00:00|None... +prec_5|...|2001-01-13 00:00:00|None... +prec_6|...|2001-01-16 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_weeks_increment_and_no_intervall(self): @@ -269,17 +253,13 @@ def test_with_weeks_increment_and_no_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2001-01-29 00:00:00|None", - "prec_3|...|2001-02-26 00:00:00|None", - "prec_4|...|2001-03-26 00:00:00|None", - "prec_5|...|2001-04-23 00:00:00|None", - "prec_6|...|2001-05-21 00:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|None... +prec_2|...|2001-01-29 00:00:00|None... +prec_3|...|2001-02-26 00:00:00|None... +prec_4|...|2001-03-26 00:00:00|None... +prec_5|...|2001-04-23 00:00:00|None... +prec_6|...|2001-05-21 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_months_increment_and_no_intervall(self): @@ -308,17 +288,13 @@ def test_with_months_increment_and_no_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-08-01 00:00:00|None", - "prec_2|...|2001-10-01 00:00:00|None", - "prec_3|...|2001-12-01 00:00:00|None", - "prec_4|...|2002-02-01 00:00:00|None", - "prec_5|...|2002-04-01 00:00:00|None", - "prec_6|...|2002-06-01 00:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-08-01 00:00:00|None... +prec_2|...|2001-10-01 00:00:00|None... +prec_3|...|2001-12-01 00:00:00|None... +prec_4|...|2002-02-01 00:00:00|None... +prec_5|...|2002-04-01 00:00:00|None... +prec_6|...|2002-06-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_re_registering(self): @@ -351,17 +327,13 @@ def test_re_registering(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2021-04-02 04:00:00|None", - "prec_3|...|2041-07-03 08:00:00|None", - "prec_4|...|2061-10-04 12:00:00|None", - "prec_5|...|2082-01-05 16:00:00|None", - "prec_6|...|2102-04-06 20:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|None... +prec_2|...|2021-04-02 04:00:00|None... +prec_3|...|2041-07-03 08:00:00|None... +prec_4|...|2061-10-04 12:00:00|None... +prec_5|...|2082-01-05 16:00:00|None... +prec_6|...|2102-04-06 20:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) # Register with different valid time again @@ -396,17 +368,13 @@ def test_re_registering(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2100-10-10 09:00:00|None", - "prec_3|...|2200-07-19 18:00:00|None", - "prec_4|...|2300-04-29 03:00:00|None", - "prec_5|...|2400-02-07 12:00:00|None", - "prec_6|...|2499-11-16 21:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|None... +prec_2|...|2100-10-10 09:00:00|None... +prec_3|...|2200-07-19 18:00:00|None... +prec_4|...|2300-04-29 03:00:00|None... +prec_5|...|2400-02-07 12:00:00|None... +prec_6|...|2499-11-16 21:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) # Register with different valid time again creating an interval @@ -442,17 +410,13 @@ def test_re_registering(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2100-10-10 09:00:00", - "prec_2|...|2100-10-10 09:00:00|2200-07-19 18:00:00", - "prec_3|...|2200-07-19 18:00:00|2300-04-29 03:00:00", - "prec_4|...|2300-04-29 03:00:00|2400-02-07 12:00:00", - "prec_5|...|2400-02-07 12:00:00|2499-11-17 21:00:00", - "prec_6|...|2499-11-16 21:00:00|2599-08-26 06:00:00", - ] - ) + ref_str = """name|mapset|start_time|end_time... +prec_1|...|2001-01-01 00:00:00|2100-10-10 09:00:00... +prec_2|...|2100-10-10 09:00:00|2200-07-19 18:00:00... +prec_3|...|2200-07-19 18:00:00|2300-04-29 03:00:00... +prec_4|...|2300-04-29 03:00:00|2400-02-07 12:00:00... +prec_5|...|2400-02-07 12:00:00|2499-11-17 21:00:00... +prec_6|...|2499-11-16 21:00:00|2599-08-26 06:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) diff --git a/temporal/t.register/testsuite/test_t_register_raster_different_local.py b/temporal/t.register/testsuite/test_t_register_raster_different_local.py index aa888a46cf6..1155f14f80e 100644 --- a/temporal/t.register/testsuite/test_t_register_raster_different_local.py +++ b/temporal/t.register/testsuite/test_t_register_raster_different_local.py @@ -129,17 +129,7 @@ def test_with_different_local(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2000-01-01 00:00:00|2000-02-01 00:00:00", - "prec_2|...|2000-02-01 00:00:00|2000-03-01 00:00:00", - "prec_3|...|2000-03-01 00:00:00|2000-04-01 00:00:00", - "prec_4|...|2000-04-01 00:00:00|2000-05-01 00:00:00", - "prec_5|...|2000-05-01 00:00:00|2000-06-01 00:00:00", - "prec_6|...|2000-06-01 00:00:00|2000-07-01 00:00:00", - ] - ) + ref_str = """name|mapset|start_time|end_time...prec_1|...|2000-01-01 00:00:00|2000-02-01 00:00:00...prec_2|...|2000-02-01 00:00:00|2000-03-01 00:00:00...prec_3|...|2000-03-01 00:00:00|2000-04-01 00:00:00...prec_4|...|2000-04-01 00:00:00|2000-05-01 00:00:00...prec_5|...|2000-05-01 00:00:00|2000-06-01 00:00:00...prec_6|...|2000-06-01 00:00:00|2000-07-01 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) diff --git a/temporal/t.register/testsuite/test_t_register_raster_file.py b/temporal/t.register/testsuite/test_t_register_raster_file.py index c8f8abeb55c..198ff476ba0 100755 --- a/temporal/t.register/testsuite/test_t_register_raster_file.py +++ b/temporal/t.register/testsuite/test_t_register_raster_file.py @@ -107,17 +107,7 @@ def test_with_file_and_increment(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2001-02-01 00:00:00|None", - "prec_3|...|2001-03-01 00:00:00|None", - "prec_4|...|2001-04-01 00:00:00|None", - "prec_5|...|2001-05-01 00:00:00|None", - "prec_6|...|2001-06-01 00:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|None...prec_2|...|2001-02-01 00:00:00|None...prec_3|...|2001-03-01 00:00:00|None...prec_4|...|2001-04-01 00:00:00|None...prec_5|...|2001-05-01 00:00:00|None...prec_6|...|2001-06-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_file_and_no_increment(self): @@ -148,17 +138,7 @@ def test_with_file_and_no_increment(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2001-01-01 00:00:00|None", - "prec_3|...|2001-01-01 00:00:00|None", - "prec_4|...|2001-01-01 00:00:00|None", - "prec_5|...|2001-01-01 00:00:00|None", - "prec_6|...|2001-01-01 00:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|None...prec_2|...|2001-01-01 00:00:00|None...prec_3|...|2001-01-01 00:00:00|None...prec_4|...|2001-01-01 00:00:00|None...prec_5|...|2001-01-01 00:00:00|None...prec_6|...|2001-01-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_file_increment_and_intervall(self): @@ -192,32 +172,24 @@ def test_with_file_increment_and_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = "\n".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2001-02-01 00:00:00", - "prec_2|...|2001-02-01 00:00:00|2001-03-01 00:00:00", - "prec_3|...|2001-03-01 00:00:00|2001-04-01 00:00:00", - "prec_4|...|2001-04-01 00:00:00|2001-05-01 00:00:00", - "prec_5|...|2001-05-01 00:00:00|2001-06-01 00:00:00", - "prec_6|...|2001-06-01 00:00:00|2001-07-01 00:00:00", - ] - ) + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2001-02-01 00:00:00 +prec_2|...|2001-02-01 00:00:00|2001-03-01 00:00:00 +prec_3|...|2001-03-01 00:00:00|2001-04-01 00:00:00 +prec_4|...|2001-04-01 00:00:00|2001-05-01 00:00:00 +prec_5|...|2001-05-01 00:00:00|2001-06-01 00:00:00 +prec_6|...|2001-06-01 00:00:00|2001-07-01 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_start_in_file(self): tmp_file = gs.tempfile() Path(tmp_file).write_text( - "\n".join( - [ - "prec_1|2001-01-01", - "prec_2|2001-02-01", - "prec_3|2001-03-01", - "prec_4|2001-04-01", - "prec_5|2001-05-01", - "prec_6|2001-06-01", - ] - ) + """prec_1|2001-01-01 +prec_2|2001-02-01 +prec_3|2001-03-01 +prec_4|2001-04-01 +prec_5|2001-05-01 +prec_6|2001-06-01""" ) register_module = SimpleModule( @@ -243,32 +215,18 @@ def test_with_start_in_file(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|None", - "prec_2|...|2001-02-01 00:00:00|None", - "prec_3|...|2001-03-01 00:00:00|None", - "prec_4|...|2001-04-01 00:00:00|None", - "prec_5|...|2001-05-01 00:00:00|None", - "prec_6|...|2001-06-01 00:00:00|None", - ] - ) + ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|None...prec_2|...|2001-02-01 00:00:00|None...prec_3|...|2001-03-01 00:00:00|None...prec_4|...|2001-04-01 00:00:00|None...prec_5|...|2001-05-01 00:00:00|None...prec_6|...|2001-06-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_start_in_file_and_increment(self): tmp_file = gs.tempfile() Path(tmp_file).write_text( - "\n".join( - [ - "prec_1|2001-01-01", - "prec_2|2001-02-01", - "prec_3|2001-03-01", - "prec_4|2001-04-01", - "prec_5|2001-05-01", - "prec_6|2001-06-01", - ] - ) + """prec_1|2001-01-01 +prec_2|2001-02-01 +prec_3|2001-03-01 +prec_4|2001-04-01 +prec_5|2001-05-01 +prec_6|2001-06-01""" ) register_module = SimpleModule( @@ -287,16 +245,12 @@ def test_with_start_in_file_and_increment(self): def test_with_start_and_end_in_file_and_interval(self): tmp_file = gs.tempfile() Path(tmp_file).write_text( - "\n".join( - [ - "prec_1|2001-01-01|2001-04-01", - "prec_2|2001-04-01|2001-07-01", - "prec_3|2001-07-01|2001-10-01", - "prec_4|2001-10-01|2002-01-01", - "prec_5|2002-01-01|2002-04-01", - "prec_6|2002-04-01|2002-07-01", - ] - ) + """prec_1|2001-01-01|2001-04-01 +prec_2|2001-04-01|2001-07-01 +prec_3|2001-07-01|2001-10-01 +prec_4|2001-10-01|2002-01-01 +prec_5|2002-01-01|2002-04-01 +prec_6|2002-04-01|2002-07-01""" ) register_module = SimpleModule( @@ -353,17 +307,7 @@ def test_with_mapset_and_semantic_label(self): t_rast_list.run() # Check registered raster maps - ref_str = "...".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2001-04-01 00:00:00", - "prec_2|...|2001-04-01 00:00:00|2001-07-01 00:00:00", - "prec_3|...|2001-07-01 00:00:00|2001-10-01 00:00:00", - "prec_4|...|2001-10-01 00:00:00|2002-01-01 00:00:00", - "prec_5|...|2002-01-01 00:00:00|2002-04-01 00:00:00", - "prec_6|...|2002-04-01 00:00:00|2002-07-01 00:00:00", - ] - ) + ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|2001-04-01 00:00:00...prec_2|...|2001-04-01 00:00:00|2001-07-01 00:00:00...prec_3|...|2001-07-01 00:00:00|2001-10-01 00:00:00...prec_4|...|2001-10-01 00:00:00|2002-01-01 00:00:00...prec_5|...|2002-01-01 00:00:00|2002-04-01 00:00:00...prec_6|...|2002-04-01 00:00:00|2002-07-01 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) diff --git a/temporal/t.register/testsuite/test_t_register_raster_mapmetadata.py b/temporal/t.register/testsuite/test_t_register_raster_mapmetadata.py index 3e434856d42..d466e91a0f6 100644 --- a/temporal/t.register/testsuite/test_t_register_raster_mapmetadata.py +++ b/temporal/t.register/testsuite/test_t_register_raster_mapmetadata.py @@ -120,17 +120,13 @@ def test_register_metadata_from_file(self): t_rast_list.run() # Check registered raster maps - ref_str = "\n".join( - [ - "name|mapset|start_time|end_time", - "prec_1|...|2001-01-01 00:00:00|2001-01-01 08:00:00", - "prec_2|...|2001-01-01 08:00:00|2001-01-01 16:00:00", - "prec_3|...|2001-01-01 16:00:00|2001-01-02 00:00:00", - "prec_4|...|2001-01-02 00:00:00|2001-01-02 08:00:00", - "prec_5|...|2001-01-02 08:00:00|2001-01-02 16:00:00", - "prec_6|...|2001-01-02 16:00:00|2001-01-03 00:00:00", - ] - ) + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2001-01-01 08:00:00 +prec_2|...|2001-01-01 08:00:00|2001-01-01 16:00:00 +prec_3|...|2001-01-01 16:00:00|2001-01-02 00:00:00 +prec_4|...|2001-01-02 00:00:00|2001-01-02 08:00:00 +prec_5|...|2001-01-02 08:00:00|2001-01-02 16:00:00 +prec_6|...|2001-01-02 16:00:00|2001-01-03 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) From dec5724e0562bab5a4eda2c9840134d540dc8cd2 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Tue, 11 Feb 2025 18:07:46 -0500 Subject: [PATCH 2/4] explicit newlines --- .../testsuite/test_t_register_raster.py | 84 +++++++++---------- .../test_t_register_raster_different_local.py | 8 +- .../testsuite/test_t_register_raster_file.py | 8 +- 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/temporal/t.register/testsuite/test_t_register_raster.py b/temporal/t.register/testsuite/test_t_register_raster.py index 6df0b4ad3b8..3b2af391797 100755 --- a/temporal/t.register/testsuite/test_t_register_raster.py +++ b/temporal/t.register/testsuite/test_t_register_raster.py @@ -110,12 +110,12 @@ def test_with_second_increment_and_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|2001-01-01 00:00:01... -prec_2|...|2001-01-01 00:00:01|2001-01-01 00:00:02... -prec_3|...|2001-01-01 00:00:02|2001-01-01 00:00:03... -prec_4|...|2001-01-01 00:00:03|2001-01-01 00:00:04... -prec_5|...|2001-01-01 00:00:04|2001-01-01 00:00:05... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2001-01-01 00:00:01 +prec_2|...|2001-01-01 00:00:01|2001-01-01 00:00:02 +prec_3|...|2001-01-01 00:00:02|2001-01-01 00:00:03 +prec_4|...|2001-01-01 00:00:03|2001-01-01 00:00:04 +prec_5|...|2001-01-01 00:00:04|2001-01-01 00:00:05 prec_6|...|2001-01-01 00:00:05|2001-01-01 00:00:06""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) @@ -146,12 +146,12 @@ def test_with_minutes_seconds_increment_and_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|2001-01-01 00:05:20... -prec_2|...|2001-01-01 00:05:20|2001-01-01 00:10:40... -prec_3|...|2001-01-01 00:10:40|2001-01-01 00:16:00... -prec_4|...|2001-01-01 00:16:00|2001-01-01 00:21:20... -prec_5|...|2001-01-01 00:21:20|2001-01-01 00:26:40... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2001-01-01 00:05:20 +prec_2|...|2001-01-01 00:05:20|2001-01-01 00:10:40 +prec_3|...|2001-01-01 00:10:40|2001-01-01 00:16:00 +prec_4|...|2001-01-01 00:16:00|2001-01-01 00:21:20 +prec_5|...|2001-01-01 00:21:20|2001-01-01 00:26:40 prec_6|...|2001-01-01 00:26:40|2001-01-01 00:32:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) @@ -218,12 +218,12 @@ def test_with_days_increment_and_no_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|None... -prec_2|...|2001-01-04 00:00:00|None... -prec_3|...|2001-01-07 00:00:00|None... -prec_4|...|2001-01-10 00:00:00|None... -prec_5|...|2001-01-13 00:00:00|None... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2001-01-04 00:00:00|None +prec_3|...|2001-01-07 00:00:00|None +prec_4|...|2001-01-10 00:00:00|None +prec_5|...|2001-01-13 00:00:00|None prec_6|...|2001-01-16 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) @@ -253,12 +253,12 @@ def test_with_weeks_increment_and_no_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|None... -prec_2|...|2001-01-29 00:00:00|None... -prec_3|...|2001-02-26 00:00:00|None... -prec_4|...|2001-03-26 00:00:00|None... -prec_5|...|2001-04-23 00:00:00|None... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2001-01-29 00:00:00|None +prec_3|...|2001-02-26 00:00:00|None +prec_4|...|2001-03-26 00:00:00|None +prec_5|...|2001-04-23 00:00:00|None prec_6|...|2001-05-21 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) @@ -288,12 +288,12 @@ def test_with_months_increment_and_no_intervall(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-08-01 00:00:00|None... -prec_2|...|2001-10-01 00:00:00|None... -prec_3|...|2001-12-01 00:00:00|None... -prec_4|...|2002-02-01 00:00:00|None... -prec_5|...|2002-04-01 00:00:00|None... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-08-01 00:00:00|None +prec_2|...|2001-10-01 00:00:00|None +prec_3|...|2001-12-01 00:00:00|None +prec_4|...|2002-02-01 00:00:00|None +prec_5|...|2002-04-01 00:00:00|None prec_6|...|2002-06-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) @@ -327,12 +327,12 @@ def test_re_registering(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|None... -prec_2|...|2021-04-02 04:00:00|None... -prec_3|...|2041-07-03 08:00:00|None... -prec_4|...|2061-10-04 12:00:00|None... -prec_5|...|2082-01-05 16:00:00|None... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2021-04-02 04:00:00|None +prec_3|...|2041-07-03 08:00:00|None +prec_4|...|2061-10-04 12:00:00|None +prec_5|...|2082-01-05 16:00:00|None prec_6|...|2102-04-06 20:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) @@ -410,12 +410,12 @@ def test_re_registering(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|2100-10-10 09:00:00... -prec_2|...|2100-10-10 09:00:00|2200-07-19 18:00:00... -prec_3|...|2200-07-19 18:00:00|2300-04-29 03:00:00... -prec_4|...|2300-04-29 03:00:00|2400-02-07 12:00:00... -prec_5|...|2400-02-07 12:00:00|2499-11-17 21:00:00... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2100-10-10 09:00:00 +prec_2|...|2100-10-10 09:00:00|2200-07-19 18:00:00 +prec_3|...|2200-07-19 18:00:00|2300-04-29 03:00:00 +prec_4|...|2300-04-29 03:00:00|2400-02-07 12:00:00 +prec_5|...|2400-02-07 12:00:00|2499-11-17 21:00:00 prec_6|...|2499-11-16 21:00:00|2599-08-26 06:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) diff --git a/temporal/t.register/testsuite/test_t_register_raster_different_local.py b/temporal/t.register/testsuite/test_t_register_raster_different_local.py index 1155f14f80e..5c0467ae06f 100644 --- a/temporal/t.register/testsuite/test_t_register_raster_different_local.py +++ b/temporal/t.register/testsuite/test_t_register_raster_different_local.py @@ -129,7 +129,13 @@ def test_with_different_local(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time...prec_1|...|2000-01-01 00:00:00|2000-02-01 00:00:00...prec_2|...|2000-02-01 00:00:00|2000-03-01 00:00:00...prec_3|...|2000-03-01 00:00:00|2000-04-01 00:00:00...prec_4|...|2000-04-01 00:00:00|2000-05-01 00:00:00...prec_5|...|2000-05-01 00:00:00|2000-06-01 00:00:00...prec_6|...|2000-06-01 00:00:00|2000-07-01 00:00:00""" + ref_str = """name|mapset|start_time|end_time +prec_1|...|2000-01-01 00:00:00|2000-02-01 00:00:00 +prec_2|...|2000-02-01 00:00:00|2000-03-01 00:00:00 +prec_3|...|2000-03-01 00:00:00|2000-04-01 00:00:00 +prec_4|...|2000-04-01 00:00:00|2000-05-01 00:00:00 +prec_5|...|2000-05-01 00:00:00|2000-06-01 00:00:00 +prec_6|...|2000-06-01 00:00:00|2000-07-01 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) diff --git a/temporal/t.register/testsuite/test_t_register_raster_file.py b/temporal/t.register/testsuite/test_t_register_raster_file.py index 198ff476ba0..04dbe76b956 100755 --- a/temporal/t.register/testsuite/test_t_register_raster_file.py +++ b/temporal/t.register/testsuite/test_t_register_raster_file.py @@ -107,7 +107,13 @@ def test_with_file_and_increment(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|None...prec_2|...|2001-02-01 00:00:00|None...prec_3|...|2001-03-01 00:00:00|None...prec_4|...|2001-04-01 00:00:00|None...prec_5|...|2001-05-01 00:00:00|None...prec_6|...|2001-06-01 00:00:00|None""" + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2001-02-01 00:00:00|None +prec_3|...|2001-03-01 00:00:00|None +prec_4|...|2001-04-01 00:00:00|None +prec_5|...|2001-05-01 00:00:00|None +prec_6|...|2001-06-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_file_and_no_increment(self): From 60fdbc1ed4a1bd6de7418797dab9b2f82816b4e6 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Wed, 12 Feb 2025 23:35:45 -0500 Subject: [PATCH 3/4] Standardize mapset string comparisons --- .../testsuite/test_t_register_raster_file.py | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/temporal/t.register/testsuite/test_t_register_raster_file.py b/temporal/t.register/testsuite/test_t_register_raster_file.py index 04dbe76b956..c05a9d07140 100755 --- a/temporal/t.register/testsuite/test_t_register_raster_file.py +++ b/temporal/t.register/testsuite/test_t_register_raster_file.py @@ -143,8 +143,14 @@ def test_with_file_and_no_increment(self): t_rast_list = SimpleModule("t.rast.list", input="precip_abs8") t_rast_list.run() - # Check registered raster maps - ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|None...prec_2|...|2001-01-01 00:00:00|None...prec_3|...|2001-01-01 00:00:00|None...prec_4|...|2001-01-01 00:00:00|None...prec_5|...|2001-01-01 00:00:00|None...prec_6|...|2001-01-01 00:00:00|None""" + # Check registered raster maps - using newlines instead of ... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2001-01-01 00:00:00|None +prec_3|...|2001-01-01 00:00:00|None +prec_4|...|2001-01-01 00:00:00|None +prec_5|...|2001-01-01 00:00:00|None +prec_6|...|2001-01-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_file_increment_and_intervall(self): @@ -220,8 +226,14 @@ def test_with_start_in_file(self): t_rast_list = SimpleModule("t.rast.list", input="precip_abs8") t_rast_list.run() - # Check registered raster maps - ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|None...prec_2|...|2001-02-01 00:00:00|None...prec_3|...|2001-03-01 00:00:00|None...prec_4|...|2001-04-01 00:00:00|None...prec_5|...|2001-05-01 00:00:00|None...prec_6|...|2001-06-01 00:00:00|None""" + # Check registered raster maps - using newlines instead of ... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2001-02-01 00:00:00|None +prec_3|...|2001-03-01 00:00:00|None +prec_4|...|2001-04-01 00:00:00|None +prec_5|...|2001-05-01 00:00:00|None +prec_6|...|2001-06-01 00:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) def test_with_start_in_file_and_increment(self): @@ -312,8 +324,14 @@ def test_with_mapset_and_semantic_label(self): t_rast_list = SimpleModule("t.rast.list", input="precip_abs8") t_rast_list.run() - # Check registered raster maps - ref_str = """name|mapset|start_time|end_time...prec_1|...|2001-01-01 00:00:00|2001-04-01 00:00:00...prec_2|...|2001-04-01 00:00:00|2001-07-01 00:00:00...prec_3|...|2001-07-01 00:00:00|2001-10-01 00:00:00...prec_4|...|2001-10-01 00:00:00|2002-01-01 00:00:00...prec_5|...|2002-01-01 00:00:00|2002-04-01 00:00:00...prec_6|...|2002-04-01 00:00:00|2002-07-01 00:00:00""" + # Check registered raster maps - using newlines instead of ... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|2001-04-01 00:00:00 +prec_2|...|2001-04-01 00:00:00|2001-07-01 00:00:00 +prec_3|...|2001-07-01 00:00:00|2001-10-01 00:00:00 +prec_4|...|2001-10-01 00:00:00|2002-01-01 00:00:00 +prec_5|...|2002-01-01 00:00:00|2002-04-01 00:00:00 +prec_6|...|2002-04-01 00:00:00|2002-07-01 00:00:00""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str) From 01c62f783191de36a3be64d9a02f742fe2319162 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Thu, 13 Feb 2025 18:51:26 -0500 Subject: [PATCH 4/4] removed ... to fix assertion error --- .../t.register/testsuite/test_t_register_raster.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/temporal/t.register/testsuite/test_t_register_raster.py b/temporal/t.register/testsuite/test_t_register_raster.py index 3b2af391797..59a82a8acd7 100755 --- a/temporal/t.register/testsuite/test_t_register_raster.py +++ b/temporal/t.register/testsuite/test_t_register_raster.py @@ -368,12 +368,12 @@ def test_re_registering(self): t_rast_list.run() # Check registered raster maps - ref_str = """name|mapset|start_time|end_time... -prec_1|...|2001-01-01 00:00:00|None... -prec_2|...|2100-10-10 09:00:00|None... -prec_3|...|2200-07-19 18:00:00|None... -prec_4|...|2300-04-29 03:00:00|None... -prec_5|...|2400-02-07 12:00:00|None... + ref_str = """name|mapset|start_time|end_time +prec_1|...|2001-01-01 00:00:00|None +prec_2|...|2100-10-10 09:00:00|None +prec_3|...|2200-07-19 18:00:00|None +prec_4|...|2300-04-29 03:00:00|None +prec_5|...|2400-02-07 12:00:00|None prec_6|...|2499-11-16 21:00:00|None""" self.assertLooksLike(str(t_rast_list.outputs.stdout), ref_str)