Merge branch 'master' into pointsix-upgrade

Author: iamed2

.travis.yml

@@ -7,6 +7,9 @@ julia:
   - nightly
 notifications:
   email: false
+matrix:
+  allow_failures:
+  - julia: nightly
 # uncomment the following lines to override the default test script
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi

src/core.jl

@@ -511,6 +511,7 @@ immutable Unsupported <: AxisTrait end
 
 """
     axistrait(ax::Axis) -> Type{<:AxisTrait}
+    axistrait{T}(::Type{T}) -> Type{<:AxisTrait}
 
 Returns the indexing type of an `Axis`, any subtype of `AxisTrait`.
 The default is `Unsupported`, meaning there is no special indexing behaviour for this axis
@@ -523,13 +524,16 @@ User-defined axis types can be added along with custom indexing behaviors by def
 methods of this function. Here is the example of adding a custom Dimensional axis:
 
 ```julia
-AxisArrays.axistrait(v::MyCustomAxis) = AxisArrays.Dimensional
+AxisArrays.axistrait(::Type{MyCustomAxis}) = AxisArrays.Dimensional
 ```
 """
-axistrait(::Any) = Unsupported
-axistrait(ax::Axis) = axistrait(ax.val)
-axistrait{T<:Union{Number, Dates.AbstractTime}}(::AbstractVector{T}) = Dimensional
-axistrait{T<:Union{Symbol, AbstractString}}(::AbstractVector{T}) = Categorical
+axistrait{T}(::T) = axistrait(T)
+axistrait{T}(::Type{T}) = Unsupported
+axistrait{name, T}(::Type{Axis{name, T}}) = axistrait(T)
+axistrait{T<:AbstractVector}(::Type{T}) = _axistrait_el(eltype(T))
+_axistrait_el{T<:Union{Number, Dates.AbstractTime}}(::Type{T}) = Dimensional
+_axistrait_el{T<:Union{Symbol, AbstractString}}(::Type{T}) = Categorical
+_axistrait_el{T}(::Type{T}) = Unsupported
 
 checkaxis(ax::Axis) = checkaxis(ax.val)
 checkaxis(ax) = checkaxis(axistrait(ax), ax)

src/sortedvector.jl

@@ -65,7 +65,7 @@ Base.size(v::SortedVector) = size(v.data)
 Base.size(v::SortedVector, i) = size(v.data, i)
 Base.indices(v::SortedVector) = indices(v.data)
 
-axistrait(::SortedVector) = Dimensional
+axistrait{T}(::Type{SortedVector{T}}) = Dimensional
 checkaxis(::SortedVector) = nothing
 
 

test/core.jl

@@ -187,9 +187,13 @@ A = @inferred(AxisArray(vals, Axis{:Timestamp}(dt-Dates.Hour(2):Dates.Hour(1):dt
 @test A[dt, :].data == vals[3, :]
 
 @test AxisArrays.axistrait(A.axes[1]) == AxisArrays.Dimensional
+@test AxisArrays.axistrait(typeof(A.axes[1])) == AxisArrays.Dimensional
 @test AxisArrays.axistrait(A.axes[1].val) == AxisArrays.Dimensional
+@test AxisArrays.axistrait(typeof(A.axes[1].val)) == AxisArrays.Dimensional
 @test AxisArrays.axistrait(A.axes[2]) == AxisArrays.Categorical
+@test AxisArrays.axistrait(typeof(A.axes[2])) == AxisArrays.Categorical
 @test AxisArrays.axistrait(A.axes[2].val) == AxisArrays.Categorical
+@test AxisArrays.axistrait(typeof(A.axes[2].val)) == AxisArrays.Categorical
 
 @test_throws ArgumentError AxisArrays.checkaxis(Axis{:x}(10:-1:1))
 @test_throws ArgumentError AxisArrays.checkaxis(10:-1:1)