Bump Julia version and eliminate some version-dependent code

Author: timholy

.travis.yml

@@ -4,7 +4,7 @@ os:
   - linux
   - osx
 julia:
-  - 0.5
+  - 0.6
   - nightly
 notifications:
   email: false

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.5
+julia 0.6
 Colors 0.7.1
 ColorTypes 0.4
 FixedPointNumbers 0.3.0

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - 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://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://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/ColorVectorSpace.jl

@@ -280,19 +280,8 @@ dotc(x::AbstractGray, y::AbstractGray) = dotc(promote(x, y)...)
 float{T<:Gray}(::Type{T}) = typeof(float(zero(T)))
 
 # Mixed types
-if VERSION < v"0.6.0-dev.2009"
-    (+)(a::MathTypes, b::MathTypes) = (+)(promote(a, b)...)
-    (-)(a::MathTypes, b::MathTypes) = (-)(promote(a, b)...)
-else
-    (+)(a::MathTypes, b::MathTypes) = (+)(Base.promote_noncircular(a, b)...)
-    (-)(a::MathTypes, b::MathTypes) = (-)(Base.promote_noncircular(a, b)...)
-end
-
-if VERSION < v"0.6.0-dev.1839"
-    include("dots.jl")
-elseif VERSION < v"0.6.0-pre.beta.101"
-    Base.Broadcast.eltypestuple(c::Colorant) = Tuple{typeof(c)}
-end
+(+)(a::MathTypes, b::MathTypes) = (+)(Base.promote_noncircular(a, b)...)
+(-)(a::MathTypes, b::MathTypes) = (-)(Base.promote_noncircular(a, b)...)
 
 Compat.@dep_vectorize_2arg Gray max
 Compat.@dep_vectorize_2arg Gray min

src/dots.jl

@@ -4,8 +4,6 @@ using ColorVectorSpace, Colors, FixedPointNumbers, Compat, StatsBase
 
 using Base.Test
 
-const use_broadcast_rules = VERSION >= v"0.6.0-dev.1839"
-
 macro test_colortype_approx_eq(a, b)
     :(test_colortype_approx_eq($(esc(a)), $(esc(b)), $(string(a)), $(string(b))))
 end
@@ -91,17 +89,10 @@ end
         @test typeof(acu-acf) == Vector{Gray{Float32}}
         @test typeof(acu.+acf) == Vector{Gray{Float32}}
         @test typeof(acu.-acf) == Vector{Gray{Float32}}
-        if use_broadcast_rules
-            @test typeof(acu+cf) == Vector{Gray{Float32}}
-            @test typeof(acu-cf) == Vector{Gray{Float32}}
-            @test typeof(acu.+cf) == Vector{Gray{Float32}}
-            @test typeof(acu.-cf) == Vector{Gray{Float32}}
-        else
-            @test typeof(acu+cf) == Vector{Gray{N0f8}}
-            @test typeof(acu-cf) == Vector{Gray{N0f8}}
-            @test typeof(acu.+cf) == Vector{Gray{N0f8}}
-            @test typeof(acu.-cf) == Vector{Gray{N0f8}}
-        end
+        @test typeof(acu+cf) == Vector{Gray{Float32}}
+        @test typeof(acu-cf) == Vector{Gray{Float32}}
+        @test typeof(acu.+cf) == Vector{Gray{Float32}}
+        @test typeof(acu.-cf) == Vector{Gray{Float32}}
         @test typeof(2*acf) == Vector{Gray{Float32}}
         @test typeof(2.*acf) == Vector{Gray{Float32}}
         @test typeof(0x02*acu) == Vector{Gray{Float32}}
@@ -245,17 +236,10 @@ end
         @test typeof(acu-acf) == Vector{RGB{Float32}}
         @test typeof(acu.+acf) == Vector{RGB{Float32}}
         @test typeof(acu.-acf) == Vector{RGB{Float32}}
-        if use_broadcast_rules
-            @test typeof(acu+cf) == Vector{RGB{Float32}}
-            @test typeof(acu-cf) == Vector{RGB{Float32}}
-            @test typeof(acu.+cf) == Vector{RGB{Float32}}
-            @test typeof(acu.-cf) == Vector{RGB{Float32}}
-        else
-            @test typeof(acu+cf) == Vector{RGB{N0f8}}
-            @test typeof(acu-cf) == Vector{RGB{N0f8}}
-            @test typeof(acu.+cf) == Vector{RGB{N0f8}}
-            @test typeof(acu.-cf) == Vector{RGB{N0f8}}
-        end
+        @test typeof(acu+cf) == Vector{RGB{Float32}}
+        @test typeof(acu-cf) == Vector{RGB{Float32}}
+        @test typeof(acu.+cf) == Vector{RGB{Float32}}
+        @test typeof(acu.-cf) == Vector{RGB{Float32}}
         @test typeof(2*acf) == Vector{RGB{Float32}}
         @test typeof(convert(UInt8, 2)*acu) == Vector{RGB{Float32}}
         @test typeof(acu/2) == Vector{RGB{typeof(N0f8(0.5)/2)}}
@@ -323,17 +307,10 @@ end
         @test typeof(acu-acf) == Vector{RGBA{Float32}}
         @test typeof(acu.+acf) == Vector{RGBA{Float32}}
         @test typeof(acu.-acf) == Vector{RGBA{Float32}}
-        if use_broadcast_rules
-            @test typeof(acu+cf) == Vector{RGBA{Float32}}
-            @test typeof(acu-cf) == Vector{RGBA{Float32}}
-            @test typeof(acu.+cf) == Vector{RGBA{Float32}}
-            @test typeof(acu.-cf) == Vector{RGBA{Float32}}
-        else
-            @test typeof(acu+cf) == Vector{RGBA{N0f8}}
-            @test typeof(acu-cf) == Vector{RGBA{N0f8}}
-            @test typeof(acu.+cf) == Vector{RGBA{N0f8}}
-            @test typeof(acu.-cf) == Vector{RGBA{N0f8}}
-        end
+        @test typeof(acu+cf) == Vector{RGBA{Float32}}
+        @test typeof(acu-cf) == Vector{RGBA{Float32}}
+        @test typeof(acu.+cf) == Vector{RGBA{Float32}}
+        @test typeof(acu.-cf) == Vector{RGBA{Float32}}
         @test typeof(2*acf) == Vector{RGBA{Float32}}
         @test typeof(convert(UInt8, 2)*acu) == Vector{RGBA{Float32}}
         @test typeof(acu/2) == Vector{RGBA{typeof(N0f8(0.5)/2)}}