diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 80058142..f144cc38 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: version: - - '1.0' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'. + - 'lts' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'. - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia. - 'nightly' os: diff --git a/Project.toml b/Project.toml index d4a8b90a..f5569786 100644 --- a/Project.toml +++ b/Project.toml @@ -10,7 +10,6 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" [weakdeps] @@ -35,10 +34,9 @@ MacroTools = "^0.5" Measurements = "2.8" OrderedCollections = "1.4" Parameters = "^0.12" -Requires = "0.5, 1.0" StatsBase = "0.33, 0.34" Tables = "1" -julia = "1" +julia = "1.10" [extras] Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" diff --git a/ext/ColorsExt.jl b/ext/ColorsExt.jl index 1f693916..11f5b1e0 100644 --- a/ext/ColorsExt.jl +++ b/ext/ColorsExt.jl @@ -2,7 +2,7 @@ module ColorsExt import PGFPlotsX -PGFPlotsX.EXTENSIONS_SUPPORTED ? (using Colors) : (using ..Colors) +using Colors function _rgb_for_printing(c::Colors.Colorant) rgb = convert(Colors.RGB{Float64}, c) diff --git a/ext/ContourExt.jl b/ext/ContourExt.jl index 1818195f..435656ce 100644 --- a/ext/ContourExt.jl +++ b/ext/ContourExt.jl @@ -2,7 +2,7 @@ module ContourExt import PGFPlotsX -PGFPlotsX.EXTENSIONS_SUPPORTED ? (using Contour) : (using ..Contour) +using Contour function PGFPlotsX.TableData(c::Contour.ContourCollection; kwargs...) colx = Any[] diff --git a/ext/MeasurementsExt.jl b/ext/MeasurementsExt.jl index 9adab396..4deb171c 100644 --- a/ext/MeasurementsExt.jl +++ b/ext/MeasurementsExt.jl @@ -2,7 +2,7 @@ module MeasurementsExt import PGFPlotsX -PGFPlotsX.EXTENSIONS_SUPPORTED ? (using Measurements) : (using ..Measurements) +using Measurements function PGFPlotsX.Coordinates(x::AbstractVector{T}, y::AbstractVector; kwargs...) where T <: Measurements.Measurement{<:Real} diff --git a/ext/StatsBaseExt.jl b/ext/StatsBaseExt.jl index 3d74358d..8331351c 100644 --- a/ext/StatsBaseExt.jl +++ b/ext/StatsBaseExt.jl @@ -2,7 +2,7 @@ module StatsBaseExt import PGFPlotsX -PGFPlotsX.EXTENSIONS_SUPPORTED ? (using StatsBase) : (using ..StatsBase) +using StatsBase function PGFPlotsX.TableData(h::StatsBase.Histogram{T, 1}; kwargs...) where T diff --git a/src/PGFPlotsX.jl b/src/PGFPlotsX.jl index 9c007a6c..41228ad2 100644 --- a/src/PGFPlotsX.jl +++ b/src/PGFPlotsX.jl @@ -121,13 +121,6 @@ include("build.jl") include("precompile_PGFPlotsX.jl") _precompile_() -# TODO: Replace with proper version -const EXTENSIONS_SUPPORTED = isdefined(Base, :get_extension) - -if !EXTENSIONS_SUPPORTED - using Requires: @require -end - function __init__() pushdisplay(PGFPlotsXDisplay()) atreplinit(i -> begin @@ -136,13 +129,6 @@ function __init__() end pushdisplay(PGFPlotsXDisplay()) end) - - @static if !EXTENSIONS_SUPPORTED - @require Colors="5ae59095-9a9b-59fe-a467-6f913c188581" include("../ext/ColorsExt.jl") - @require Contour="d38c429a-6771-53c6-b99e-75d170b6e991" include("../ext/ContourExt.jl") - @require StatsBase="2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" include("../ext/StatsBaseExt.jl") - @require Measurements="eff96d63-e80a-5855-80a2-b1b0885c5ab7" include("../ext/MeasurementsExt.jl") - end end end # module