Merge branch 'main' into fix-RET505-superfluous-else-return

pyproject.toml

@@ -179,13 +179,6 @@ ignore = [
  "PLW1641", # eq-without-hash
  "PLW2901", # redefined-loop-name
  "PLW3201", # bad-dunder-method-name
- "PT001", # pytest-fixture-incorrect-parentheses-style
- "PT004", # pytest-missing-fixture-name-underscore
- "PT006", # pytest-parametrize-names-wrong-type
- "PT009", # pytest-unittest-assertion
- "PT011", # pytest-raises-too-broad
- "PT018", # pytest-composite-assertion
- "PT023", # pytest-incorrect-mark-parentheses-style
  "PTH100", # os-path-abspath
  "PTH101", # os-chmod
  "PTH102", # os-mkdir
@@ -312,12 +305,12 @@ ignore = [
 "python/grass/__init__.py" = ["PYI056"]
 "python/grass/exp*/tests/grass_script_mapset_session_test.py" = ["SIM117"]
 "python/grass/exp*/tests/grass_script_tmp_mapset_session_test.py" = ["SIM117"]
+"python/grass/gunittest/case.py" = ["PT009"]
 "python/grass/gunittest/loader.py" = ["PYI024"]
 "python/grass/gunittest/multireport.py" = ["PYI024"]
 "python/grass/gunittest/testsu*/d*/s*/s*/subsub*/t*/test_segfaut.py" = ["B018"]
 "python/grass/gunittest/testsuite/test_assertions_rast3d.py" = ["FLY002"]
 "python/grass/imaging/images2*.py" = ["SIM115"]
-"python/grass/jupyter/tests/reprojection_renderer_test.py" = ["PT013"]
 "python/grass/jupyter/testsuite/interactivemap_test.py" = ["PGH004"]
 "python/grass/jupyter/testsuite/map_test.py" = ["PGH004"]
 "python/grass/pydispatch/signal.py" = ["A005"]

python/grass/experimental/tests/grass_script_mapset_session_test.py

@@ -68,7 +68,8 @@ def test_create_overwrite(xy_session):
  .strip()
  .split()
  )
- assert len(rasters) == 1 and rasters[0] == "a"
+ assert len(rasters) == 1
+ assert rasters[0] == "a"
  with experimental.MapsetSession(
  name, create=True, overwrite=True, env=xy_session.env
  ) as session:
@@ -86,7 +87,8 @@ def test_create_overwrite(xy_session):
  .strip()
  .split()
  )
- assert len(rasters) == 1 and rasters[0] == "a"
+ assert len(rasters) == 1
+ assert rasters[0] == "a"
  assert os.path.exists(session_file)
 
 
@@ -103,7 +105,8 @@ def test_ensure(xy_session):
  .strip()
  .split()
  )
- assert len(rasters) == 1 and rasters[0] == "a"
+ assert len(rasters) == 1
+ assert rasters[0] == "a"
  with experimental.MapsetSession(name, ensure=True, env=xy_session.env) as session:
  session_mapset = gs.read_command("g.mapset", flags="p", env=session.env).strip()
  assert name == session_mapset
@@ -112,7 +115,8 @@ def test_ensure(xy_session):
  .strip()
  .split()
  )
- assert len(rasters) == 1 and rasters[0] == "a"
+ assert len(rasters) == 1
+ assert rasters[0] == "a"
  gs.run_command("r.mapcalc", expression="b = 1", env=session.env)
  rasters = (
  gs.read_command("g.list", type="raster", mapset=".", env=session.env)

python/grass/jupyter/tests/reprojection_renderer_test.py

@@ -1,7 +1,7 @@
 """Test ReprojectionRenderer functions"""
 
 from pathlib import Path
-from pytest import approx
+import pytest
 from grass.jupyter.reprojection_renderer import ReprojectionRenderer
 
 
@@ -21,8 +21,8 @@ def test_render_raster(simple_dataset):
  assert Path(filename).exists()
  # Test bounding box is correct
  # Raster is same extent as region so no need to test bbox for use_region=True
- assert bbox[0] == approx([0.00072155, -85.48874388])
- assert bbox[1] == approx([0.00000000, -85.48766880])
+ assert bbox[0] == pytest.approx([0.00072155, -85.48874388])
+ assert bbox[1] == pytest.approx([0.00000000, -85.48766880])
 
 
 # render_vector produces json

python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py

@@ -210,7 +210,7 @@ def run_grid_module():
 
 @xfail_mp_spawn
 @pytest.mark.parametrize(
- "width, height, processes",
+ ("width", "height", "processes"),
  [
  (None, None, max_processes()),
  (10, None, max_processes()),
@@ -249,7 +249,7 @@ def run_grid_module():
 @xfail_mp_spawn
 @pytest.mark.needs_solo_run
 @pytest.mark.parametrize(
- "processes, backend",
+ ("processes", "backend"),
  [
  (1, "RasterRow"),
  (9, "RasterRow"),

python/grass/script/tests/grass_script_setup_test.py

@@ -51,7 +51,7 @@ def test_init_session_finish(tmp_path):
  gs.run_command("g.region", flags="p", env=session.env)
  session_file = session.env["GISRC"]
  session.finish()
- with pytest.raises(ValueError):
+ with pytest.raises(ValueError): # noqa: PT011
  session.finish()
  assert not session.active
  assert not os.path.exists(session_file)

temporal/t.rast.list/tests/t_rast_list_test.py

@@ -83,7 +83,7 @@ def test_yaml(space_time_raster_dataset):
 
 @pytest.mark.needs_solo_run
 @pytest.mark.parametrize(
- "separator,delimiter", [(None, ","), (",", ","), (";", ";"), ("tab", "\t")]
+ ("separator", "delimiter"), [(None, ","), (",", ","), (";", ";"), ("tab", "\t")]
 )
 def test_csv(space_time_raster_dataset, separator, delimiter):
  """Check CSV can be parsed with different separators"""