Merge branch 'master' into nl/cutweights

Author: nalimilan

.github/workflows/ci.yml

@@ -12,13 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         version:
+          # FIXME! Switch from 1.6 to 'min' once we require a higher minimum
+          # We can't switch yet as there is a method ambiguity for a depndency
+          # in version 1.6.0.
           - '1.6'
+          - 'lts'
           - '1' # automatically expands to the latest stable 1.x release of Julia
-          - 'nightly'
+          - 'pre'
         os:
           - ubuntu-latest
-          - macOS-latest
-          - windows-latest
         arch:
           - x64
           - x86

Project.toml

@@ -48,13 +48,13 @@ Arrow = "69666777-d1a9-59fb-9406-91d4454c9d45"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
-Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
+RecipesPipeline = "01d81517-befc-4cb6-b9ec-a95719d0359c"
 SentinelArrays = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 StructTypes = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Arrow", "Dates", "JSON", "JSON3", "Plots", "PooledArrays", "RecipesBase", "SentinelArrays", "StatsBase", "StructTypes", "Test"]
+test = ["Arrow", "Dates", "JSON", "JSON3", "PooledArrays", "RecipesBase", "RecipesPipeline", "SentinelArrays", "StructTypes", "Test"]

src/CategoricalArrays.jl

@@ -35,8 +35,6 @@ module CategoricalArrays
     include("extras.jl")
     include("recode.jl")
 
-    include("deprecated.jl")
-
     if !isdefined(Base, :get_extension)
         using Requires: @require
     end

src/array.jl

@@ -790,13 +790,7 @@ entries corresponding to omitted levels will be set to `missing`.
 Else, `newlevels` must include all levels which appear in the data.
 """
 function levels!(A::CategoricalArray{T, N, R}, newlevels::AbstractVector;
-                 allowmissing::Bool=false,
-                 allow_missing::Union{Bool, Nothing}=nothing) where {T, N, R}
-    if allow_missing !== nothing
-        Base.depwarn("allow_missing argument is deprecated, use allowmissing instead",
-                     :levels!)
-        allowmissing = allow_missing
-    end
+                 allowmissing::Bool=false) where {T, N, R}
     (levels(A) == newlevels) && return A # nothing to do
 
     # map each new level to its ref code

src/deprecated.jl

@@ -27,7 +27,9 @@ function fill_refs!(refs::AbstractArray, X::AbstractArray,
     end
 end
 
-const CUT_FMT = Printf.Format("%.*g")
+if VERSION >= v"1.10"
+    const CUT_FMT = Printf.Format("%.*g")
+end
 
 """
     CategoricalArrays.default_formatter(from, to, i::Integer;
@@ -44,12 +46,21 @@ If they are floating points values, breaks are turned into to strings using
 function default_formatter(from, to, i::Integer;
                            leftclosed::Bool, rightclosed::Bool,
                            sigdigits::Integer)
-    from_str = from isa AbstractFloat ?
-        Printf.format(CUT_FMT, sigdigits, from) :
-        string(from)
-    to_str = to isa AbstractFloat ?
-        Printf.format(CUT_FMT, sigdigits, to) :
-        string(to)
+    @static if VERSION >= v"1.10"
+        from_str = from isa AbstractFloat ?
+            Printf.format(CUT_FMT, sigdigits, from) :
+            string(from)
+        to_str = to isa AbstractFloat ?
+            Printf.format(CUT_FMT, sigdigits, to) :
+            string(to)
+    else
+        from_str = from isa AbstractFloat ?
+            Printf.format(Printf.Format("%.$(sigdigits)g"), from) :
+            string(from)
+        to_str = to isa AbstractFloat ?
+            Printf.format(Printf.Format("%.$(sigdigits)g"), to) :
+            string(to)
+    end
     string(leftclosed ? "[" : "(", from_str, ", ", to_str, rightclosed ? "]" : ")")
 end
 
@@ -164,19 +175,7 @@ julia> cut(-1:0.5:1, 3, labels=fmt)
                      extend::Union{Bool, Missing}=false,
                      labels::Union{AbstractVector{<:SupportedTypes},Function}=default_formatter,
                      sigdigits::Integer=3,
-                     allowmissing::Union{Bool, Nothing}=nothing,
-                     allow_missing::Union{Bool, Nothing}=nothing,
                      allowempty::Bool=false)
-    if allow_missing !== nothing
-        Base.depwarn("allow_missing argument is deprecated, use extend=missing instead",
-                     :cut)
-        extend = missing
-    end
-    if allowmissing !== nothing
-        Base.depwarn("allowmissing argument is deprecated, use extend=missing instead",
-                     :cut)
-         extend = missing
-    end
     return _cut(x, breaks, extend, labels, sigdigits, allowempty)
 end
 
@@ -251,8 +250,13 @@ function _cut(x::AbstractArray{T, N}, breaks::AbstractVector,
                 b2 = breaks[i]
                 isequal(b1, b2) && continue
 
-                b1_str = Printf.format(CUT_FMT, sigdigits, b1)
-                b2_str = Printf.format(CUT_FMT, sigdigits, b2)
+                @static if VERSION >= v"1.9"
+                    b1_str = Printf.format(CUT_FMT, sigdigits, b1)
+                    b2_str = Printf.format(CUT_FMT, sigdigits, b2)
+                else
+                    b1_str = Printf.format(Printf.Format("%.$(sigdigits)g"), b1)
+                    b2_str = Printf.format(Printf.Format("%.$(sigdigits)g"), b2)
+                end
                 if b1_str == b2_str
                     sigdigits += 1
                     break

src/extras.jl

@@ -55,9 +55,9 @@ using CategoricalArrays: DefaultRefType, refcode, reftype, leveltype
         @test convert(Union{T, U}, v3)::T == v3
     end
 
-    @test unwrap(v1) === get(v1) === 1
-    @test unwrap(v2) === get(v2) === 2
-    @test unwrap(v3) === get(v3) === 3
+    @test unwrap(v1) === 1
+    @test unwrap(v2) === 2
+    @test unwrap(v3) === 3
 
     @test promote(1, v1) === (1, 1)
     @test promote(1.0, v1) === (1.0, 1.0)

test/05_convert.jl

@@ -719,7 +719,7 @@ using CategoricalArrays: DefaultRefType, leveltype
         @test levels(x) == ["c", "a", "b"]
 
         ordered!(x, ordered)
-        v = CategoricalValue(2, CategoricalPool(["xyz", "b"]))
+        v = CategoricalValue(CategoricalPool(["xyz", "b"]), 2)
         x[1] = v
         @test x[1] === CategoricalValue(x.pool, 4)
         @test x[2] === CategoricalValue(x.pool, 1)

test/11_array.jl

@@ -8,7 +8,7 @@ using PooledArrays
 using JSON3
 using StructTypes
 using RecipesBase
-using Plots
+using RecipesPipeline
 using SentinelArrays
 using Arrow
 using Missings
@@ -893,7 +893,7 @@ end
             @test sort(cv, rev=rev, by=byf1) ≅ sort(cv, rev=rev, by=byf1)
 
             # Check that by function is not called on unused levels/missing
-            byf2 = x -> (@assert get(x) != "b"; x)
+            byf2 = x -> (@assert x != "b"; x)
             replace!(cv, missing=>"a", "b"=>"a")
             @test sort(cv, rev=rev, by=byf2) ≅ sort(cv, rev=rev, by=byf2)
         end