Merge pull request #91 from queryverse/prepare-for-next-statsmodels

Prepare for next statsmodels

Author: davidanthoff

CONTRIBUTING.md

@@ -1 +1 @@
-By contributing code to IterableTables.jl, you are agreeing to release it under the [MIT License](https://github.com/davidanthoff/IterableTables.jl/blob/master/LICENSE.md).
+By contributing code to IterableTables.jl, you are agreeing to release it under the [MIT License](https://github.com/queryverse/IterableTables.jl/blob/master/LICENSE.md).

LICENSE.md

@@ -1,6 +1,6 @@
 The IterableTables.jl package is licensed under the MIT "Expat" License:
 
-> Copyright (c) 2017-2018: David Anthoff.
+> Copyright (c) 2017-2019: David Anthoff.
 > 
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy

NEWS.md

@@ -1,3 +1,6 @@
+# IterableTables.jl v0.11.0 Release Notes
+* Remove StatsModels.jl integration for versions that load Tables.jl
+
 # IterableTables.jl v0.10.0 Release Notes
 * Reenable TimerSeries.jl support
 * Reenable Temporal.jl support

src/IterableTables.jl

@@ -11,7 +11,9 @@ function __init__()
     @require DataFrames="a93c6f00-e57d-5684-b7b6-d8193f3e46c0" if !isdefined(DataFrames, :Tables)
         include("integrations/dataframes.jl")
     end
-    @require StatsModels="3eaba693-59b7-5ba5-a881-562e759f1c8d" include("integrations/statsmodels.jl")
+    @require StatsModels="3eaba693-59b7-5ba5-a881-562e759f1c8d" if !isdefined(StatsModels, :Tables)
+        include("integrations/statsmodels.jl")
+    end
     @require TimeSeries="9e3dc215-6440-5c97-bce1-76c03772f85e" include("integrations/timeseries.jl")
     @require Temporal="a110ec8f-48c8-5d59-8f7e-f91bc4cc0c3d" include("integrations/temporal.jl")
 end

test/runtests.jl

@@ -6,8 +6,7 @@ end
 @testset "IterableTables" begin
 
 include("test_integration_dataframes.jl")
-# TODO Reenable once GLM is 0.7 compatible
-# include("test_integration_statsmodels.jl")
+include("test_integration_statsmodels.jl")
 include("test_integration_timeseries.jl")
 include("test_integration_temporal.jl")
 # include("test_integration_juliadb.jl")

test/test_integration_statsmodels.jl

@@ -6,11 +6,12 @@ using Test
 
 @testset "StatsModels" begin
 
-source_array = [(a=DataValue(1),b=DataValue(1.),c=DataValue("A")), (a=DataValue(2),b=DataValue(2.),c=DataValue("B")), (a=DataValue(3),b=DataValue(3.),c=DataValue("C"))]
+source_array = [(a=1,b=1.,c="A"), (a=2,b=2.,c="B"), (a=3,b=3.,c="C")]
 
-# TODO add some test beyond just creating a ModelFrame
 mf_array = StatsModels.ModelFrame(StatsModels.@formula(a~b), source_array)
 
-# lm(StatsModels.@formula(a~b), source_df)
+@test mf_array isa StatsModels.ModelFrame
+
+x = lm(StatsModels.@formula(a~b), source_array)
 
 end