Merge pull request #1370 from pmgbergen/ruff_on_test

Require ruff and isort on the test suite

Author: IvarStefansson

.github/workflows/run-static-checks.yml

@@ -102,17 +102,17 @@ jobs:
     # Run the various checks
     - name: Ruff linting
       if: ${{ always() }}
-      run: ruff check src
+      run: ruff check src tests
 
     - name: Ruff formatting
       if: ${{always()}}
-      run: ruff format --check src
+      run: ruff format --check src tests
 
       # EK note to self: Ruff may introduce sorting of imports in the future, if so, we
       # should use that instead of isort.
     - name: isort 
       if: ${{ always() }}
-      run: isort src 
+      run: isort src tests
 
     - name: mypy
       if: ${{ always() }}

tests/applications/md_grids/test_mdg_library.py

@@ -3,8 +3,8 @@
 cause problems, we deactivate the corresponding asserts.
 """
 
-import pytest
 import numpy as np
+import pytest
 
 import porepy as pp
 

tests/applications/test_convergence_analysis.py

@@ -21,8 +21,8 @@
 import porepy as pp
 from porepy.applications.convergence_analysis import ConvergenceAnalysis
 from porepy.applications.md_grids.mdg_library import (
-    square_with_orthogonal_fractures,
     cube_with_orthogonal_fractures,
+    square_with_orthogonal_fractures,
 )
 from porepy.models.fluid_mass_balance import SinglePhaseFlow
 from porepy.utils.txt_io import read_data_from_txt

tests/compositional/test_materials.py

@@ -11,13 +11,12 @@
 
 from __future__ import annotations
 
+from dataclasses import FrozenInstanceError
+
 import numpy as np
 import pytest
 
 import porepy as pp
-
-from dataclasses import FrozenInstanceError
-
 from porepy.examples.flow_benchmark_2d_case_1 import FractureSolidConstants
 
 

tests/functional/setups/manu_flow_comp_2d_frac.py

@@ -567,9 +567,7 @@ def interface_flux(self, intf: pp.MortarGrid, time: number) -> np.ndarray:
 
         return lmbda_cc
 
-    def matrix_boundary_pressure(
-        self, bg: pp.BoundaryGrid, time: number
-    ) -> np.ndarray:
+    def matrix_boundary_pressure(self, bg: pp.BoundaryGrid, time: number) -> np.ndarray:
         """Exact pressure at the boundary faces.
 
         Parameters:

tests/functional/setups/manu_poromech_nofrac_2d.py

@@ -56,7 +56,6 @@
 import sympy as sym
 
 import porepy as pp
-
 from porepy.applications.convergence_analysis import ConvergenceAnalysis
 from porepy.applications.md_grids.domains import nd_cube_domain
 from porepy.utils.examples_utils import VerificationUtils

tests/functional/test_benchmark_2d_case_3.py

@@ -13,19 +13,18 @@
 
 """
 
+from typing import Literal
+
 import numpy as np
 import pytest
 
 import porepy as pp
-
-
+from porepy.applications.test_utils.benchmarks import EffectivePermeability
 from porepy.examples.flow_benchmark_2d_case_3 import (
     FlowBenchmark2dCase3aModel,
     FlowBenchmark2dCase3bModel,
     solid_constants,
 )
-from porepy.applications.test_utils.benchmarks import EffectivePermeability
-from typing import Literal
 
 
 class Model3aWithEffectivePermeability(

tests/functional/test_benchmark_3d_case_3.py

@@ -13,17 +13,17 @@
 
 """
 
+from typing import Literal
+
 import numpy as np
 import pytest
 
 import porepy as pp
-
+from porepy.applications.test_utils.benchmarks import EffectivePermeability
 from porepy.examples.flow_benchmark_3d_case_3 import (
     FlowBenchmark3dCase3Model,
     solid_constants,
 )
-from porepy.applications.test_utils.benchmarks import EffectivePermeability
-from typing import Literal
 
 
 class ModelWithEffectivePermeability(

tests/functional/test_mandel.py

@@ -21,10 +21,9 @@
 import pytest
 
 import porepy as pp
-
 from porepy.examples.mandel_biot import (
-    MandelSaveData,
     MandelModel,
+    MandelSaveData,
     mandel_fluid_constants,
     mandel_solid_constants,
 )

tests/functional/test_manu_flow_comp_frac.py

@@ -47,8 +47,8 @@
 from tests.functional.setups.manu_flow_comp_2d_frac import (
     ManuCompFlowModel2d,
     manu_comp_fluid,
-    manu_comp_solid,
     manu_comp_ref_vals,
+    manu_comp_solid,
 )
 from tests.functional.setups.manu_flow_comp_3d_frac import ManuCompFlowModel3d