Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

temporal: Fix FLY002: String-join inefficiencies in temporal/t.register tests #5087

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+133 −209
Open

temporal: Fix FLY002: String-join inefficiencies in temporal/t.register tests #5087

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2567226
update
arohanajit Feb 11, 2025
dec5724
explicit newlines
arohanajit Feb 11, 2025
60fdbc1
Standardize mapset string comparisons
arohanajit Feb 13, 2025
01c62f7
removed ... to fix assertion error
arohanajit Feb 13, 2025
39ebe57
Merge branch 'main' into ruff-tregister
arohanajit Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
162 changes: 63 additions & 99 deletions temporal/t.register/testsuite/test_t_register_raster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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...
arohanajit marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -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)


Expand Down
18 changes: 7 additions & 11 deletions temporal/t.register/testsuite/test_t_register_raster_different_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,13 @@ 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)


Expand Down
Loading
Loading