Merge branch 'master' into mh/reduce_init

Author: martinholters

.travis.yml

@@ -4,6 +4,7 @@ os:
     - osx
 julia:
     - 0.6
+    - 0.7
     - nightly
 notifications:
   email: false

README.md

@@ -308,6 +308,8 @@ Currently, the `@compat` macro supports the following syntaxes:
 * `something` to get the first argument different from `nothing`, unwrapping those
   of the `Some` type ([#27258]).
 
+* `mapslices` with `dims` keyword argument ([#27828]).
+
 ## Renaming
 
 * `Display` is now `AbstractDisplay` ([#24831]).
@@ -662,3 +664,4 @@ includes this fix. Find the minimum version from there.
 [#27401]: https://github.com/JuliaLang/julia/issues/27401
 [#27711]: https://github.com/JuliaLang/julia/issues/27711
 [#27834]: https://github.com/JuliaLang/julia/issues/27834
+[#27828]: https://github.com/JuliaLang/julia/issues/27828

appveyor.yml

@@ -3,6 +3,8 @@ environment:
   matrix:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-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"
 

src/Compat.jl

@@ -1974,6 +1974,12 @@ end
         Base.split(s, splitter; limit=limit, keep=keepempty)
 end
 
+# https://github.com/JuliaLang/julia/pull/27828
+if VERSION < v"0.7.0-beta.73"
+    Base.mapslices(f, A::AbstractArray; dims=error("required keyword argument `dims` missing")) =
+        mapslices(f, A, dims)
+end
+
 include("deprecated.jl")
 
 end # module Compat

test/runtests.jl

@@ -1896,4 +1896,14 @@ let
     @test Compat.split(str, r"\.+:\.+"; limit=3, keepempty=true) == ["a","ba","cba.:.:.dcba.:."]
 end
 
+# 0.7.0-beta.73
+let a = rand(5,5)
+    s = mapslices(sort, a, dims=[1])
+    S = mapslices(sort, a, dims=[2])
+    for i = 1:5
+        @test s[:,i] == sort(a[:,i])
+        @test vec(S[i,:]) == sort(vec(a[i,:]))
+    end
+end
+
 nothing