Merge pull request #255 from tkelman/tk/deprecation-backport

[release-0.4] backport of deprecation fix (#254) and CI updates (#253)

Author: ararslan

.travis.yml

@@ -1,6 +1,5 @@
 language: julia
 julia:
-  - 0.4
   - 0.5
   - nightly
 os:

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.4
-StatsBase 0.3
+julia 0.5
+StatsBase 0.15
 Compat 0.8.6
 Reexport

appveyor.yml

@@ -1,16 +1,15 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:
     - master
     - /julia-.*/
+    - /release-.*/
 
 notifications:
   - provider: Email
@@ -19,14 +18,15 @@ notifications:
     on_build_status_changed: false
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # if there's a newer build queued for the same PR, cancel this one
   - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
         throw "There are newer queued builds for this pull request, failing early." }
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

src/extras.jl

@@ -5,7 +5,7 @@ function StatsBase.addcounts!{T,U}(cm::Dict{U,Int}, x::AbstractDataArray{T})
     return cm
 end
 
-function StatsBase.addcounts!{T,U,W}(cm::Dict{U,W}, x::AbstractDataArray{T}, wv::WeightVec{W})
+function StatsBase.addcounts!{T,U,W}(cm::Dict{U,W}, x::AbstractDataArray{T}, wv::Weights{W})
     n = length(x)
     length(wv) == n || raise_dimerror()
     w = values(wv)
@@ -23,7 +23,7 @@ function StatsBase.countmap{T}(x::AbstractDataArray{T})
     addcounts!(Dict{(@compat Union{T, NAtype}), Int}(), x)
 end
 
-function StatsBase.countmap{T,W}(x::AbstractDataArray{T}, wv::WeightVec{W})
+function StatsBase.countmap{T,W}(x::AbstractDataArray{T}, wv::Weights{W})
     addcounts!(Dict{(@compat Union{T, NAtype}), W}(), x, wv)
 end
 

src/reduce.jl

@@ -175,7 +175,7 @@ Base.std(A::DataArray; corrected::Bool=true, mean=nothing, skipna::Bool=false) =
 
 ## weighted mean
 
-function Base.mean(a::DataArray, w::WeightVec; skipna::Bool=false)
+function Base.mean(a::DataArray, w::Weights; skipna::Bool=false)
     if skipna
         v = a .* w.values
         sum(v; skipna=true) / sum(DataArray(w.values, v.na); skipna=true)
@@ -184,7 +184,7 @@ function Base.mean(a::DataArray, w::WeightVec; skipna::Bool=false)
     end
 end
 
-function Base.mean{W,V<:DataArray}(a::DataArray, w::WeightVec{W,V}; skipna::Bool=false)
+function Base.mean{W,V<:DataArray}(a::DataArray, w::Weights{W,V}; skipna::Bool=false)
     if skipna
         v = a .* w.values
         sum(v; skipna=true) / sum(DataArray(w.values.data, v.na); skipna=true)

test/reduce.jl

@@ -164,6 +164,5 @@ da1[1:3:end] = NA
 
 da2[1:2:end] = NA
 keep = !da1.na & !da2.na
-@test isna(mean(da1, weights(da2)))
 @same_behavior mean(da1, weights(da2); skipna=true) mean(da1.data[keep], weights(da2.data[keep]))
 end