test against 0.20 and PlotSpec fix

MakieOrg · Nov 2, 2023 · c90da30 · c90da30
1 parent 614703c
commit c90da30
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1,570 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,15 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
+      - name: Install Julia dependencies
+        shell: julia --project=monorepo {0}
+        run: |
+          using Pkg;
+          # dev mono repo versions
+          pkg"add MakieCore#sd/beta-20 Makie#sd/beta-20; dev ."
+      - name: Run the tests
+        run: >
+          julia --color=yes --project=monorepo -e 'using Pkg; Pkg.test("AlgebraOfGraphics", coverage=true)'
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:
@@ -60,4 +68,4 @@ jobs:
       - run: julia --project=docs docs/make.jl
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
+          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
diff --git a/Project.toml b/Project.toml
@@ -33,7 +33,7 @@ GeometryBasics = "0.4.1"
 GridLayoutBase = "0.6, 0.7, 0.8, 0.9"
 KernelDensity = "0.6"
 Loess = "0.5.1, 0.6.1"
-Makie = "0.20"
+Makie = "0.19, 0.20"
 PlotUtils = "1"
 PooledArrays = "1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1.0"

diff --git a/src/recipes/choropleth.jl b/src/recipes/choropleth.jl
@@ -74,5 +74,5 @@ Makie.used_attributes(::Type{<:Choropleth}, v::AbstractVector) = (:transformatio
 function Makie.convert_arguments(::Type{<:Choropleth}, v::AbstractVector;
                                  transformation=trivialtransformation)
     geometries = map(Base.Fix1(to_geometry, transformation), v)
-    return PlotSpec{Poly}(geometries)
+    return PlotSpec(:poly, geometries)
 end