sync with upstream

Author: andrejcarlo

.github/workflows/TagBot.yml

@@ -6,9 +6,20 @@ on:
   workflow_dispatch:
     inputs:
       lookback:
-        default: 3
+        default: "3"
 permissions:
+  actions: read
+  checks: read
   contents: write
+  deployments: read
+  issues: read
+  discussions: read
+  packages: read
+  pages: read
+  pull-requests: read
+  repository-projects: read
+  security-events: read
+  statuses: read
 jobs:
   TagBot:
     if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'

.github/workflows/ci.yml

@@ -1,5 +1,5 @@
 name: CI
-on: [push]
+on: [push, pull_request]
 jobs:
   test:
     strategy:
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.julia_version }}
-      - uses: julia-actions/cache@v1
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v4

Project.toml

@@ -1,7 +1,7 @@
 name = "TrajectoryGamesBase"
 uuid = "ac1ac542-73eb-4349-ae1b-660ab3609574"
 authors = ["David Fridovich-Keil <[email protected]>", "Forrest Laine <[email protected]", "Lasse Peters <[email protected]>"]
-version = "0.3.8"
+version = "0.3.11"
 
 [deps]
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
@@ -18,15 +18,15 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 
 [extensions]
-MakieVizExt = "Makie"
+MakieExt = "Makie"
 
 [compat]
 BlockArrays = "0.16"
 Colors = "0.12"
 GeometryBasics = "0.4.2"
-InfiniteArrays = "0.12, 0.13"
+InfiniteArrays = "0.12, 0.13, 0.14"
 LazySets = "1.54, 2"
-Makie = "0.17, 0.18, 0.19, 0.20"
+Makie = "0.17, 0.18, 0.19, 0.20, 0.21"
 Polyhedra = "0.7"
 julia = "1.7"
 

ext/MakieVizExt.jl ext/MakieExt.jlext/MakieVizExt.jl renamed to ext/MakieExt.jl

@@ -1,12 +1,15 @@
-module MakieVizExt
+module MakieExt
 using TrajectoryGamesBase: TrajectoryGamesBase
 using Makie: Makie, @recipe
 using Colors: @colorant_str
 using GeometryBasics: GeometryBasics
 
 Makie.plottype(::TrajectoryGamesBase.PolygonEnvironment) = Makie.Poly
 
-function Makie.convert_arguments(::Type{<:Makie.Poly}, environment::TrajectoryGamesBase.PolygonEnvironment)
+function Makie.convert_arguments(
+    ::Type{<:Makie.Poly},
+    environment::TrajectoryGamesBase.PolygonEnvironment,
+)
     geometry = GeometryBasics.Polygon(GeometryBasics.Point{2}.(environment.set.vertices))
     (geometry,)
 end
@@ -57,7 +60,7 @@ function Makie.plot!(viz::OpenLoopStrategyViz{<:Tuple{TrajectoryGamesBase.OpenLo
             endtime = something($(viz.endtime), lastindex($strategy.xs))
             subsampled_states = $strategy.xs[starttime:($(viz.position_subsampling)):endtime]
             if $(viz.dimensionality) == 2
-                [Makie.Point2f(xi[2], xi[1]) for xi in subsampled_states]
+                [Makie.Point2f(xi[1], xi[2]) for xi in subsampled_states]
             elseif $(viz.dimensionality) == 3
                 [Makie.Point3f(xi[1], xi[2], xi[3]) for xi in subsampled_states]
             else

src/TrajectoryGamesBase.jl

@@ -65,7 +65,7 @@ export to_blockvector,
     unflatten_trajectory
 
 if !isdefined(Base, :get_extension)
-    include("../ext/MakieVizExt.jl")
+    include("../ext/MakieExt.jl")
 end
 
 end