Merge pull request #262 from JuliaDynamics/hw/bumpversions

fix ci and bump versions

Author: hexaeder

.github/workflows/Documentation.yaml

@@ -27,7 +27,9 @@ jobs:
       - uses: julia-actions/setup-julia@v2
         with:
           version: 1
-      - uses: julia-actions/cache@v2
+      - name: Load Julia packages from cache
+        id: julia-cache
+        uses: julia-actions/cache@v2
       - name: Configure doc environment
         shell: julia --project=docs --color=yes {0}
         run: |
@@ -62,3 +64,11 @@ jobs:
           using NetworkDynamics
           DocMeta.setdocmeta!(NetworkDynamics, :DocTestSetup, :(using NetworkDynamics); recursive=true)
           doctest(NetworkDynamics)
+      - name: Save Julia depot cache on cancel or failure
+        id: julia-cache-save
+        if: cancelled() || failure()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ steps.julia-cache.outputs.cache-paths }}
+          key: ${{ steps.julia-cache.outputs.cache-key }}

.github/workflows/tests.yml

@@ -35,11 +35,21 @@ jobs:
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: julia-actions/cache@v2
+      - name: Load Julia packages from cache
+        id: julia-cache
+        uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         with:
           coverage: false
+      - name: Save Julia depot cache on cancel or failure
+        id: julia-cache-save
+        if: cancelled() || failure()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ steps.julia-cache.outputs.cache-paths }}
+          key: ${{ steps.julia-cache.outputs.cache-key }}
 
   test-coverage:
     name: Test Coverage
@@ -53,7 +63,9 @@ jobs:
         with:
           version: 1
           arch: x64
-      - uses: julia-actions/cache@v2
+      - name: Load Julia packages from cache
+        id: julia-cache
+        uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         env:
@@ -66,6 +78,14 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false
+      - name: Save Julia depot cache on cancel or failure
+        id: julia-cache-save
+        if: cancelled() || failure()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ steps.julia-cache.outputs.cache-paths }}
+          key: ${{ steps.julia-cache.outputs.cache-key }}
 
   Inspector-tests:
     name: NetworkDynamicsInspector.jl Tests
@@ -93,7 +113,9 @@ jobs:
       - uses: julia-actions/setup-julia@v2
         with:
           version: 1
-      - uses: julia-actions/cache@v2
+      - name: Load Julia packages from cache
+        id: julia-cache
+        uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
         with:
           project: NetworkDynamicsInspector
@@ -108,9 +130,17 @@ jobs:
       #     files: lcov.info
       #     token: ${{ secrets.CODECOV_TOKEN }}
       #     fail_ci_if_error: false
+      - name: Save Julia depot cache on cancel or failure
+        id: julia-cache-save
+        if: cancelled() || failure()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ steps.julia-cache.outputs.cache-paths }}
+          key: ${{ steps.julia-cache.outputs.cache-key }}
 
-  pd-test:
-    name: PowerDynamics.jl test - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
+  OpPoDyn-test:
+    name: OpPoDyn.jl test - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     permissions:
       actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created
@@ -131,19 +161,22 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/julia-buildpkg@v1
+      - name: Load Julia packages from cache
+        id: julia-cache
+        uses: julia-actions/cache@v2
       - uses: actions/checkout@v4
         with:
-          repository: JuliaEnergy/PowerDynamics.jl
-          path: PowerDynamics.jl
-      - name: Run PD tests
-        shell: julia --project=PowerDynamics.jl {0}
+          repository: JuliaEnergy/OpPoDyn.jl
+          path: OpPoDyn
+      - name: Run OpPoDyn tests
+        shell: julia --project=testenv --color=yes {0}
         run: |
-            import Pkg
+            using Pkg
             try
-              Pkg.develop(path=".")
-              Pkg.update()
-              Pkg.precompile()
-              Pkg.test()
+              pkg"dev ."
+              pkg"dev ./OpPoDyn"
+              pkg"dev ./OpPoDyn/OpPoDynTesting"
+              Pkg.test("OpPoDyn"; coverage=false)
             catch e
               if e isa Pkg.Resolve.ResolverError
                 @info "Resolve error! No need to test a breaking release..." e
@@ -152,3 +185,11 @@ jobs:
                 rethrow(e)
               end
             end
+      - name: Save Julia depot cache on cancel or failure
+        id: julia-cache-save
+        if: cancelled() || failure()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ steps.julia-cache.outputs.cache-paths }}
+          key: ${{ steps.julia-cache.outputs.cache-key }}

NetworkDynamicsInspector/Project.toml

@@ -27,7 +27,7 @@ NetworkDynamics = {path = ".."}
 NetworkDynamicsInspectorElectronExt = ["Electron"]
 
 [compat]
-Bonito = "4.0.0"
+Bonito = "4.0.4"
 ColorSchemes = "3.29.0"
 Colors = "0.13.0"
 Downloads = "1.6.0"

NetworkDynamicsInspector/ext/NetworkDynamicsInspectorElectronExt.jl

@@ -26,6 +26,7 @@ function NDI.close_display(::NDI.ElectronDisp; strict)
 end
 
 function get_electron_display()
+    app = NDI.get_electron_app()
     window = NDI.get_electron_window()
     # BUG: Electron display cannot be reused
     # if isnothing(ELECTRON_DISP[]) || window != ELECTRON_DISP[].window
@@ -34,7 +35,10 @@ function get_electron_display()
     # else
     #     ELECTRON_DISP[]
     # end
-    return HTTPServer.ElectronDisplay(window, HTTPServer.BrowserDisplay(; open_browser=false))
+    return HTTPServer.ElectronDisplay(
+        HTTPServer.EWindow(app, window),
+        HTTPServer.BrowserDisplay(; open_browser=false)
+    )
 end
 
 function NDI.get_electron_window()
@@ -58,14 +62,20 @@ haswindow() = hasapp() && !isempty(windows(ELECTRON_APP[]))
 
 function NDI.get_electron_app()
     if !hasapp()
-        ELECTRON_APP[] = Electron.Application(;
-            additional_electron_args=[
-                "--disable-logging",
-                "--no-sandbox",
-                "--user-data-dir=$(mktempdir())",
-                "--disable-features=AccessibilityObjectModel",
-            ],
-        )
+        additional_electron_args = [
+            "--disable-logging",
+            "--no-sandbox",
+            "--user-data-dir=$(mktempdir())",
+            "--disable-features=AccessibilityObjectModel",
+            "--enable-unsafe-swiftshader",        # ← allow SwiftShader fallback
+        ]
+        if haskey(ENV, "GITHUB_ACTIONS")
+            append!(additional_electron_args, [
+                "--use-gl=swiftshader",               # ← explicitly request software GL
+                "--disable-gpu",                      # ← disable GPU to avoid GPU errors
+            ])
+        end
+        ELECTRON_APP[] = Electron.Application(; additional_electron_args)
     end
     ELECTRON_APP[]
 end

NetworkDynamicsInspector/src/graphplot.jl

@@ -215,8 +215,10 @@ function graphplot_card(app, session)
     help = HoverHelp(html"""
     <ul>
     <li><strong>Click</strong> on a node or edge to select it for timeseries plotting (highlighted plot).</li>
-    <li><strong>Shift + Click</strong>. only update the element info pane.</li>
-    <li><strong>Ctrl + Click</strong> resets axis after zoom</li>
+    <li><strong>Shift+click</strong>: update info pane below.</li>
+    <li><strong>Ctrl+click</strong>: resets axis after zoom.</li>
+    <li><strong>Click+drag</strong> or <strong>mousewheel</strong>: zoom in/out.</li>
+    <li><strong>Rightclick+drag</strong>: pan the graph.</li>
     </ul>
     """)
     Card([WithConfig(fig; resize_to=:parent), help, gp_tooltip_js];

NetworkDynamicsInspector/src/widgets.jl

@@ -417,6 +417,7 @@ function Bonito.jsrender(session::Session, tomselect::TomSelect{T}) where {T}
             optgroupField: 'class',
             placeholder: $(tomselect.placeholder),
             hidePlaceholder: true,
+            maxOptions: null,
             plugins: {},
         };
         // push remove button to plugins when multi

Project.toml

@@ -57,7 +57,7 @@ DataFrames = "1"
 DiffEqCallbacks = "4.2.2"
 DocStringExtensions = "0.9.3"
 FastClosures = "0.3.2"
-ForwardDiff = "0.10.36"
+ForwardDiff = "0.10.36, 1"
 Graphs = "1"
 InteractiveUtils = "1"
 KernelAbstractions = "0.9.18"

src/initialization.jl

@@ -274,7 +274,7 @@ function initialize_component!(cf; verbose=true, apply_bound_transformation=true
     else
         resid = init_residual(cf; recalc=true)
         if resid < 1e-10
-        verbose && @info "No free variables! Residual $(LinearAlgebra.norm(resid))"
+            verbose && @info "No free variables! Residual $(LinearAlgebra.norm(resid))"
         else
             @warn "No free variables! However model does not appear to be initialized in steady state. Residual $(LinearAlgebra.norm(resid))"
         end

test/Project.toml

@@ -62,8 +62,8 @@ DataFrames = "≥0.0.1"
 DataInterpolations = "7, 8"
 DelimitedFiles = "1.9.1"
 DiffEqCallbacks = "4.1.0"
-DifferentiationInterface = "0.6.32"
-DifferentiationInterfaceTest = "0.9"
+DifferentiationInterface = "0.6, 0.7"
+DifferentiationInterfaceTest = "0.10"
 DynamicQuantities = "1.4.0"
 ExplicitImports = "1.10.1"
 FiniteDiff = "2.26.2"