Improve plotting dispatch

Author: 1-Bart-1

.github/workflows/CI.yml

@@ -88,12 +88,12 @@ jobs:
         BUILD_IS_PRODUCTION_BUILD: false
     - name: Install matplotlib
       run: sudo apt-get install -y python3-matplotlib
-    - name: Build PyCall
-      run: julia --project=test -e 'ENV["PYTHON"]=""; using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")'
-    - name: Test Makie plotting
-      run: julia --project=test test/plotting/test_plotting.jl Makie
+    - name: Build PyCall with system Python
+      run: julia -e 'ENV["PYTHON"]="python3"; using Pkg; Pkg.add("PyCall"); Pkg.build("PyCall")'
     - name: Test ControlPlots plotting
-      run: julia --project=test --threads=1 test/plotting/test_plotting.jl ControlPlots
+      env:
+        JULIA_NUM_THREADS: 1
+      run: julia -e 'using Pkg; Pkg.test("VortexStepMethod", test_args=["plot-controlplots"], coverage=true)'
     - uses: julia-actions/julia-processcoverage@v1
     - uses: codecov/codecov-action@v5
       with:

test/plotting/test_plotting.jl

@@ -1,17 +1,17 @@
-backend = length(ARGS) >= 1 ? ARGS[1] : "Makie"
-if backend == "Makie"
-    using CairoMakie
-elseif backend == "ControlPlots"
+backend = if "plot-controlplots" in ARGS
     using ControlPlots
+    "ControlPlots"
 else
-    error("Unknown plotting backend: $backend. Use \"Makie\" or \"ControlPlots\".")
+    using CairoMakie
+    "Makie"
 end
 
 using VortexStepMethod
 using Test
 
 # Resolve repo data directory for ram air kite assets
-const _ram_data_dir = joinpath(dirname(dirname(@__DIR__)), "data", "ram_air_kite")
+const _ram_data_dir = joinpath(dirname(dirname(@__DIR__)),
+                               "data", "ram_air_kite")
 
 # Helper to robustly delete files on platforms with occasional file locks
 safe_rm(path) = begin
@@ -43,18 +43,15 @@ if !@isdefined ram_wing
 end
 
 function create_body_aero()
-    # Step 1: Define wing parameters
     n_panels = 20          # Number of panels
     span = 20.0            # Wing span [m]
     chord = 1.0            # Chord length [m]
     v_a = 20.0             # Magnitude of inflow velocity [m/s]
     alpha_deg = 30.0       # Angle of attack [degrees]
     alpha = deg2rad(alpha_deg)
 
-    # Step 2: Create wing geometry with linear panel distribution
     wing = Wing(n_panels, spanwise_distribution=LINEAR)
 
-    # Add wing sections
     add_section!(wing,
         [0.0, span/2, 0.0],
         [chord, span/2, 0.0],
@@ -64,7 +61,6 @@ function create_body_aero()
         [chord, -span/2, 0.0],
         INVISCID)
 
-    # Step 3: Initialize aerodynamics
     refine!(wing)
     body_aero = BodyAerodynamics([wing])
     vel_app = [cos(alpha), 0.0, sin(alpha)] .* v_a
@@ -105,15 +101,15 @@ end
     safe_rm(joinpath(save_dir,
                      "Rectangular_wing_geometry_top_view.png"))
 
-    # Step 5: Initialize the solvers
+    # Initialize the solvers
     vsm_solver = Solver(body_aero; aerodynamic_model_type=VSM)
     llt_solver = Solver(body_aero; aerodynamic_model_type=LLT)
 
-    # Step 6: Solve the VSM and LLT
+    # Solve the VSM and LLT
     results_vsm = solve(vsm_solver, body_aero)
     results_llt = solve(llt_solver, body_aero)
 
-    # Step 7: Plot spanwise distributions
+    # Plot spanwise distributions
     y_coordinates = [panel.aero_center[2]
                      for panel in body_aero.panels]
 
@@ -130,7 +126,7 @@ end
         @test fig !== nothing
     end
 
-    # Step 8: Plot polar curves
+    # Plot polar curves
     v_a = 20.0
     angle_range = range(0, 20, 20)
     fig = plot_polars(
@@ -154,7 +150,7 @@ end
     @test isfile(joinpath(save_dir, "Rectangular_Wing_Polars.png"))
     safe_rm(joinpath(save_dir, "Rectangular_Wing_Polars.png"))
 
-    # Step 9: Test polar data plotting
+    # Test polar data plotting
     body_aero = BodyAerodynamics([ram_wing])
     fig = plot_polar_data(body_aero; is_show=false)
     if backend == "Makie"

test/runtests.jl

@@ -4,11 +4,16 @@ using Test, VortexStepMethod
 cd(@__DIR__)  # ensure we're in test/ no matter how tests are launched
 include("test_data_utils.jl")
 
-# Support selective test execution via ]test test_args=["pattern"]
-const test_patterns = isempty(ARGS) ? String[] : ARGS
+# ControlPlots must run in a separate single-threaded process
+const _plot_controlplots = "plot-controlplots" in ARGS
+
+# Filter special args from pattern matching
+const test_patterns = filter(a -> a != "plot-controlplots", ARGS)
 
 println("Running tests...")
-if !isempty(test_patterns)
+if _plot_controlplots
+    println("Running plotting tests with ControlPlots backend")
+elseif !isempty(test_patterns)
     println("Filtering tests matching: ", test_patterns)
 end
 
@@ -32,25 +37,30 @@ const build_is_production_build = let v = get(ENV, build_is_production_build_env
 end::Bool
 
 @testset verbose = true "Testing VortexStepMethod..." begin
-    if build_is_production_build && should_run_test("bench")
-        include("bench.jl")
+    if _plot_controlplots
+        include("plotting/test_plotting.jl")
+    else
+        if build_is_production_build && should_run_test("bench")
+            include("bench.jl")
+        end
+        should_run_test("body_aerodynamics/test_body_aerodynamics.jl") && include("body_aerodynamics/test_body_aerodynamics.jl")
+        should_run_test("body_aerodynamics/test_results.jl") && include("body_aerodynamics/test_results.jl")
+        should_run_test("test_refinement_validation.jl") && include("test_refinement_validation.jl")
+        should_run_test("filament/test_bound_filament.jl") && include("filament/test_bound_filament.jl")
+        should_run_test("filament/test_semi_infinite_filament.jl") && include("filament/test_semi_infinite_filament.jl")
+        should_run_test("panel/test_panel.jl") && include("panel/test_panel.jl")
+        should_run_test("plotting/test_plotting.jl") && include("plotting/test_plotting.jl")
+        should_run_test("polars/test_polars.jl") && include("polars/test_polars.jl")
+        should_run_test("ram_geometry/test_kite_geometry.jl") && include("ram_geometry/test_kite_geometry.jl")
+        should_run_test("settings/test_settings.jl") && include("settings/test_settings.jl")
+        should_run_test("solver/test_solver.jl") && include("solver/test_solver.jl")
+        should_run_test("solver/test_unrefined_dist.jl") && include("solver/test_unrefined_dist.jl")
+        should_run_test("VortexStepMethod/test_VortexStepMethod.jl") && include("VortexStepMethod/test_VortexStepMethod.jl")
+        should_run_test("wake/test_wake.jl") && include("wake/test_wake.jl")
+        should_run_test("wing_geometry/test_wing_geometry.jl") && include("wing_geometry/test_wing_geometry.jl")
+        should_run_test("yaml_geometry/test_yaml_geometry.jl") && include("yaml_geometry/test_yaml_geometry.jl")
+        should_run_test("Aqua.jl") && include("Aqua.jl")
     end
-    should_run_test("body_aerodynamics/test_body_aerodynamics.jl") && include("body_aerodynamics/test_body_aerodynamics.jl")
-    should_run_test("body_aerodynamics/test_results.jl") && include("body_aerodynamics/test_results.jl")
-    should_run_test("test_refinement_validation.jl") && include("test_refinement_validation.jl")
-    should_run_test("filament/test_bound_filament.jl") && include("filament/test_bound_filament.jl")
-    should_run_test("filament/test_semi_infinite_filament.jl") && include("filament/test_semi_infinite_filament.jl")
-    should_run_test("panel/test_panel.jl") && include("panel/test_panel.jl")
-    should_run_test("polars/test_polars.jl") && include("polars/test_polars.jl")
-    should_run_test("ram_geometry/test_kite_geometry.jl") && include("ram_geometry/test_kite_geometry.jl")
-    should_run_test("settings/test_settings.jl") && include("settings/test_settings.jl")
-    should_run_test("solver/test_solver.jl") && include("solver/test_solver.jl")
-    should_run_test("solver/test_unrefined_dist.jl") && include("solver/test_unrefined_dist.jl")
-    should_run_test("VortexStepMethod/test_VortexStepMethod.jl") && include("VortexStepMethod/test_VortexStepMethod.jl")
-    should_run_test("wake/test_wake.jl") && include("wake/test_wake.jl")
-    should_run_test("wing_geometry/test_wing_geometry.jl") && include("wing_geometry/test_wing_geometry.jl")
-    should_run_test("yaml_geometry/test_yaml_geometry.jl") && include("yaml_geometry/test_yaml_geometry.jl")
-    should_run_test("Aqua.jl") && include("Aqua.jl")
 end
 
 nothing