Don't incorrectly use mark.benchmark

Author: robbievanleeuwen

noxfile.py

@@ -149,9 +149,7 @@ def tests(session: Session) -> None:
     )
 
     # install relevant tooling
-    session.install(
-        "coverage[toml]", "pytest", "pygments", "pytest-check", "pytest-benchmark"
-    )
+    session.install("coverage[toml]", "pytest", "pygments", "pytest-check")
 
     try:
         session.run(
@@ -161,7 +159,7 @@ def tests(session: Session) -> None:
             "-m",
             "pytest",
             "-m",
-            "not benchmark",
+            "not benchmark_suite",
             *session.posargs,
         )
     finally:

pyproject.toml

@@ -115,6 +115,7 @@ lines_after_imports = 2
 
 [tool.pytest.ini_options]
 markers = [
+    "benchmark_suite: entire benchmark test suite (select with '-m benchmark_suite')",
     "benchmark_geom: geometry benchmark tests (select with '-m benchmark_geom')",
     "benchmark_mesh: mesh benchmark tests (select with '-m benchmark_mesh')",
     "benchmark_analysis: analysis benchmark tests (select with '-m benchmark_analysis')",

tests/benchmarks/test_benchmark_analysis.py

@@ -5,7 +5,7 @@
 from sectionproperties.analysis import Section
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_create_section(benchmark, analysis_geometry, elements):
@@ -18,7 +18,7 @@ def create_section():
     benchmark(create_section)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_geometric_analysis(benchmark, analysis_geometry, elements):
@@ -32,7 +32,7 @@ def geometric_analysis():
     benchmark(geometric_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 def test_plastic_analysis(benchmark, analysis_geometry):
     """Benchmark test for conducting a plastic analysis.
@@ -49,7 +49,7 @@ def plastic_analysis():
     benchmark(plastic_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_warping_analysis(benchmark, analysis_geometry, elements):
@@ -64,7 +64,7 @@ def warping_analysis():
     benchmark(warping_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_frame_analysis(benchmark, analysis_geometry, elements):
@@ -78,7 +78,7 @@ def frame_analysis():
     benchmark(frame_analysis)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_analysis
 @pytest.mark.parametrize("elements", [50, 500, 5000])
 def test_stress_analysis(benchmark, analysis_geometry, elements):

tests/benchmarks/test_benchmark_geom.py

@@ -5,21 +5,21 @@
 from sectionproperties.pre.library import circular_hollow_section, rectangular_section
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_geom
 def test_create_simple_geometry(benchmark):
     """Benchmark test for creating rectangular geometry."""
     benchmark(rectangular_section, d=100, b=50)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_geom
 def test_create_intermediate_geometry(benchmark):
     """Benchmark test for creating CHS geometry."""
     benchmark(circular_hollow_section, d=100, t=3, n=128)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_geom
 def test_create_complex_geometry(benchmark, concrete_column_with_hole):
     """Benchmark test for creating concrete geometry."""

tests/benchmarks/test_benchmark_mesh.py

@@ -3,7 +3,7 @@
 import pytest
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_mesh
 @pytest.mark.parametrize("ms", [0.0, 50.0, 5.0])
 def test_create_simple_mesh(benchmark, rect_geom, ms):
@@ -12,7 +12,7 @@ def test_create_simple_mesh(benchmark, rect_geom, ms):
     benchmark(geom.create_mesh, ms)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_mesh
 @pytest.mark.parametrize("ms", [0.0, 1.0, 0.3])
 def test_create_intermediate_mesh(benchmark, chs_geom, ms):
@@ -21,7 +21,7 @@ def test_create_intermediate_mesh(benchmark, chs_geom, ms):
     benchmark(geom.create_mesh, ms)
 
 
-@pytest.mark.benchmark
+@pytest.mark.benchmark_suite
 @pytest.mark.benchmark_mesh
 @pytest.mark.parametrize("ms", [0.0, 100.0, 20.0])
 def test_create_complex_mesh(benchmark, concrete_column_with_hole, ms):