Skip to content

Commit 5f1aca8

Browse files
authored
Switch from deprecated MakieCore => Makie (#607)
1 parent 9789258 commit 5f1aca8

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1515
[weakdeps]
1616
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
1717
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
18-
MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
18+
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
1919
MutableArithmetics = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
2020

2121
[extensions]
2222
PolynomialsChainRulesCoreExt = "ChainRulesCore"
2323
PolynomialsFFTWExt = "FFTW"
24-
PolynomialsMakieCoreExt = "MakieCore"
24+
PolynomialsMakieExt = "Makie"
2525
PolynomialsMutableArithmeticsExt = "MutableArithmetics"
2626

2727
[compat]
@@ -31,7 +31,7 @@ ChainRulesTestUtils = "1"
3131
DualNumbers = "0.6"
3232
FFTW = "1"
3333
LinearAlgebra = "<0.0.1, 1"
34-
MakieCore = "0.6,0.7, 0.8, 0.9, 0.10"
34+
Makie = "0.24"
3535
MutableArithmetics = "1"
3636
OffsetArrays = "1"
3737
OrderedCollections = "1.6.3"
@@ -50,7 +50,7 @@ ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
5050
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
5151
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
5252
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
53-
MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
53+
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
5454
MutableArithmetics = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
5555
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
5656
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

ext/PolynomialsMakieCoreExt.jl

Lines changed: 0 additions & 13 deletions
This file was deleted.

ext/PolynomialsMakieExt.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module PolynomialsMakieExt
2+
3+
using Polynomials
4+
import Makie
5+
6+
function Makie.convert_arguments(P::Type{<:Makie.XYBased}, p::AbstractPolynomial)
7+
xs = Polynomials.poly_interval(p)
8+
return Makie.convert_arguments(P, xs, p.(xs))
9+
end
10+
11+
Makie.plottype(p::AbstractPolynomial) = Makie.Lines
12+
13+
end

src/Polynomials.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ end
6969

7070
function __init__()
7171
@static if !isdefined(Base, :get_extension)
72-
@require MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b" include("../ext/PolynomialsMakieCoreExt.jl")
72+
@require Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" include("../ext/PolynomialsCoreExt.jl")
7373
end
7474
end
7575

test/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
44
ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
55
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
66
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
7-
MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
7+
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
88
MutableArithmetics = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
99
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
1010
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"

test/test-extensions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
using FFTW
2-
using MakieCore
2+
using Makie
33
using ChainRulesCore

0 commit comments

Comments
 (0)