Consume CTBase.Traits; remove src/Traits (phase B)

Project.toml

@@ -10,7 +10,6 @@ CTModels = "34c4fa32-2049-4079-8329-de33c2a22e2d"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [weakdeps]
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
@@ -33,8 +32,8 @@ CTFlowsStaticArrays = ["StaticArrays"]
 [compat]
 ADTypes = "1"
 Aqua = "0.8"
-CTBase = "0.21"
-CTModels = "0.12"
+CTBase = "0.22"
+CTModels = "0.13"
 DiffEqBase = "6, 7"
 DifferentiationInterface = "0.7"
 DocStringExtensions = "0.9"
@@ -44,7 +43,6 @@ NonlinearSolve = "4"
 OrdinaryDiffEqTsit5 = "2"
 Plots = "1"
 RecipesBase = "1"
-Reexport = "1"
 SciMLBase = "3"
 StaticArrays = "1"
 Test = "1"

docs/api_reference.jl

@@ -26,32 +26,6 @@ function generate_api_reference(src_dir::String, ext_dir::String)
     EXCLUDE_BASE = Symbol[:include, :eval]
 
     pages = [
-        # ───────────────────────────────────────────────────────────────────
-        # Traits
-        # ───────────────────────────────────────────────────────────────────
-        CTBase.automatic_reference_documentation(;
-            subdirectory="api",
-            primary_modules=[
-                CTFlows.Traits => src(
-                    joinpath("Traits", "Traits.jl"),
-                    joinpath("Traits", "abstract.jl"),
-                    joinpath("Traits", "ad.jl"),
-                    joinpath("Traits", "dynamics.jl"),
-                    joinpath("Traits", "helpers.jl"),
-                    joinpath("Traits", "mode.jl"),
-                    joinpath("Traits", "mutability.jl"),
-                    joinpath("Traits", "time_dependence.jl"),
-                    joinpath("Traits", "variable_costate.jl"),
-                    joinpath("Traits", "variable_dependence.jl"),
-                ),
-            ],
-            exclude=EXCLUDE_BASE,
-            public=true,
-            private=true,
-            title="Traits",
-            title_in_menu="Traits",
-            filename="api_traits",
-        ),
         # ───────────────────────────────────────────────────────────────────
         # Configs
         # ───────────────────────────────────────────────────────────────────

docs/make.jl

@@ -100,15 +100,12 @@ with_api_reference(src_dir, ext_dir) do api_pages
                 asset("https://control-toolbox.org/assets/css/documentation.css"),
                 asset("https://control-toolbox.org/assets/js/documentation.js"),
             ],
-            size_threshold_ignore=[
-                joinpath("api", "api_traits_public.md"),
-            ],
+            size_threshold_ignore=String[],
         ),
         pages=[
             "Introduction" => "index.md",
             "Flows" => [
                 "Overview"           => "flows/index.md",
-                "Traits"             => "flows/traits.md",
                 "Data structures"    => "flows/data.md",
                 "Building a flow"    => "flows/building_a_flow.md",
                 "Integrating"        => "flows/integrating.md",

ext/CTFlowsSciMLFlows/CTFlowsSciMLFlows.jl

@@ -20,7 +20,7 @@ import CTBase.Exceptions
 using CTFlows: CTFlows
 using CTFlows.Common: Common
 using CTFlows.Configs: Configs
-using CTFlows.Traits: Traits
+using CTBase.Traits: Traits
 using CTFlows.Systems: Systems
 using CTFlows.Integrators: Integrators
 using CTFlows.Flows: Flows, AbstractFlow, build_flow

ext/CTFlowsSciMLIntegrator/CTFlowsSciMLIntegrator.jl

@@ -28,7 +28,7 @@ using CTFlows: CTFlows
 using CTFlows.Common: Common
 using CTFlows.Configs: Configs
 using CTFlows.Systems: Systems
-using CTFlows.Traits: Traits
+using CTBase.Traits: Traits
 using CTFlows.Integrators: Integrators, SciML, SciMLTag, Tsit5Tag
 using DiffEqBase: DiffEqBase
 using SciMLBase: SciMLBase, ODEProblem

src/CTFlows.jl

@@ -27,8 +27,8 @@ module CTFlows
 # Include submodules in topological order
 # ==============================================================================
 
-include(joinpath(@__DIR__, "Traits", "Traits.jl"))
-using .Traits
+# Traits moved to CTBase.Traits; alias kept so `CTFlows.Traits` still resolves.
+import CTBase.Traits
 
 include(joinpath(@__DIR__, "Configs", "Configs.jl"))
 using .Configs

src/Configs/Configs.jl

@@ -44,7 +44,7 @@ import CTBase.Exceptions
 # Sibling imports
 # ==============================================================================
 
-import ..Traits: Traits
+import CTBase.Traits
 
 # ==============================================================================
 # Includes

src/Data/Data.jl

@@ -17,7 +17,7 @@ import CTBase.Exceptions
 # ==============================================================================
 
 import ..Common: Common
-import ..Traits: Traits
+import CTBase.Traits
 
 # ==============================================================================
 # Include files

src/DifferentialGeometry/DifferentialGeometry.jl

@@ -28,7 +28,7 @@ import MacroTools: postwalk, @capture
 # Internal sibling-submodule imports
 # ==============================================================================
 
-import ..Traits: Traits
+import CTBase.Traits
 import ..Common: Common
 import ..Data: Data
 import ..Differentiation: Differentiation

src/Flows/Flows.jl

@@ -25,7 +25,7 @@ import CTModels
 
 import ..Common: Common
 import ..Configs: Configs
-import ..Traits: Traits
+import CTBase.Traits
 import ..Data: Data
 import ..Differentiation: Differentiation
 import ..Systems: Systems, hamiltonian_vector_field
@@ -40,7 +40,6 @@ include(joinpath(@__DIR__, "abstract_flow.jl"))
 include(joinpath(@__DIR__, "flow.jl"))
 include(joinpath(@__DIR__, "registry.jl"))
 include(joinpath(@__DIR__, "flow_routing.jl"))
-include(joinpath(@__DIR__, "ocp_model_traits.jl"))
 include(joinpath(@__DIR__, "optimal_control_flow.jl"))
 include(joinpath(@__DIR__, "building.jl"))
 include(joinpath(@__DIR__, "calling.jl"))

src/MultiPhase/MultiPhase.jl

@@ -20,7 +20,7 @@ import CTBase.Options
 
 import ..Common: Common
 import ..Configs: Configs
-import ..Traits: Traits
+import CTBase.Traits
 import ..Systems: Systems
 import ..Integrators: Integrators
 import ..Flows: Flows

src/Systems/Systems.jl

@@ -20,7 +20,7 @@ import CTBase.Exceptions
 # ==============================================================================
 
 import ..Common: Common
-import ..Traits: Traits
+import CTBase.Traits
 import ..Configs: Configs
 import ..Data: Data
 import ..Differentiation: Differentiation