Merge pull request #113 from alan-turing-institute/dev

For a 1.0 release

Author: ablaom

Project.toml

@@ -1,7 +1,7 @@
 name = "ScientificTypes"
 uuid = "321657f4-b219-11e9-178b-2701a2544e81"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.8.1"
+version = "1.0"
 
 [compat]
 julia = "1"

README.md

@@ -107,8 +107,8 @@ The type parameter `K` in `Table{K}` is for conveying the scientific
 type(s) of a table's columns. See [More on the `Table`
 type](#more-on-the-table-type).
 
-The julia native `Missing` type is also regarded as a scientific
-type. 
+The julia native types `Missing` and `Nothing` are also regarded as scientific
+types. 
 
 #### 2. The `scitype` and `Scitype` methods
 
@@ -133,7 +133,9 @@ appropriately. However, this package provides certain rudimentary
 fallback behaviour; only Property 1 below should be altered by the
 developer:
 
-**Property 0.** `scitype(missing) = Missing` (`Missing` is the only native type also regarded as a scientific type).
+**Property 0.** `scitype(missing) = Missing` and `scitype(nothing) =
+Nothing` (regarding `Missing` and `Nothing` as native scientific
+types).
 
 **Property 1.** `scitype(X) = Unknown`, unless `X` is a tuple, an
 abstract array, or `missing`.

src/ScientificTypes.jl

@@ -129,7 +129,7 @@ Table(S1, S2, ..., Sn) <: Table
 where  `S1, ..., Sn` are the scientific type of the table's columns which
 are expected to be represented by abstract vectors.
 """
-Table(Ts::Type{<:Scientific}...) = Table{<:Union{(Arr{<:T,1} for T in Ts)...}}
+Table(Ts::Type...) = Table{<:Union{(Arr{<:T,1} for T in Ts)...}}
 
 # -----------------------------------------------------------------
 # scitype

src/scitype.jl

@@ -39,6 +39,7 @@ scitype(X, C; kw...) = scitype(X, C, Val(trait(X)); kw...)
 
 scitype(X, C, ::Val{:other}; kw...) = Unknown
 scitype(::Missing;           kw...) = Missing
+scitype(::Nothing;           kw...) = Nothing
 
 scitype(t::Tuple, ::Convention; kw...) = Tuple{scitype.(t; kw...)...}
 
@@ -106,6 +107,8 @@ Scitype(::Type{Union{T,Missing}}, C::Convention) where T =
 # for the case Missing, we return Missing
 Scitype(::Type{Missing}, C::Convention) = Missing
 
+Scitype(::Type{Nothing}, C::Convention) = Nothing
+
 # Broadcasting over arrays
 
 scitype(A::Arr{T}, C::Convention, ::Val{:other}; kw...) where T =
@@ -120,7 +123,7 @@ If `tight=true` and `T>:Missing` then the function checks whether there are
 "true missing values", otherwise it constructs a "tight copy" of the array
 without a `Union{Missing,S}` type.
 """
-function arr_scitype(A::Arr{T,N}, C::Convention, S::Type{<:Scientific};
+function arr_scitype(A::Arr{T,N}, C::Convention, S::Type;
                      tight::Bool=false) where {T,N}
     # no explicit scitype available
     S === Unknown && return Arr{scitype_union(A),N}

test/convention.jl

@@ -37,5 +37,4 @@ end
     @test T1 == Table{K} where K<:Union{AbstractVector{<:Continuous}, AbstractVector{<:Count}}
     T2 = Table(Continuous, Union{Missing,Continuous})
     @test T2 == Table{K} where K<:Union{AbstractVector{<:Union{Missing,Continuous}}}
-    @test_throws MethodError Table(Int,Float64)
 end

test/scitype.jl

@@ -1,3 +1,9 @@
+@testset "void types" begin
+    @test scitype(nothing) == Nothing
+    @test scitype(missing) == Missing
+    @test scitype([nothing, nothing]) == AbstractVector{Nothing}
+end
+
 @testset "scitype" begin
     X = [1, 2, 3]
     @test scitype(X) == AbstractVector{Unknown}