Merge branch 'master' of https://github.com/JuliaRobotics/DistributedFactorGraphs.jl into feature/FileDFG_testing

Author: GearsAD

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.4.1"
+version = "0.5.0"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -13,24 +13,25 @@ JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
+Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-Distributions = "≥ 0.18"
-DocStringExtensions = "≥ 0.7"
-Graphs = "≥ 0.10.3"
-MetaGraphs = "≥ 0.6.4"
-Reexport = "≥ 0.2"
-Requires = "≥ 0.5"
+Distributions = "0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25, 1"
+DocStringExtensions = "0.7, 0.8, 0.9, 0.10, 1"
+Graphs = "0.10.2, 0.11, 1"
+MetaGraphs = "^0.6.3"
+Neo4j = "2"
+Reexport = "0.2, 0.3, 0.4, 0.5, 1"
+Requires = "0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 1"
 julia = "0.7, 1"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
-Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [targets]
-test = ["Test", "GraphPlot", "Neo4j", "Pkg"]
+test = ["Test", "GraphPlot", "Pkg"]

src/DistributedFactorGraphs.jl

@@ -86,18 +86,13 @@ using .SymbolDFGs
 include("LightDFG/LightDFG.jl")
 @reexport using .LightDFGs
 
+include("CloudGraphsDFG/CloudGraphsDFG.jl")
+
 #supported in Memory fg types
 const InMemoryDFGTypes = Union{GraphsDFG, LightDFG}
 export InMemoryDFGTypes
 
 function __init__()
-    @info "Looking for @require modules"
-    @require Neo4j="d2adbeaf-5838-5367-8a2f-e46d570981db" begin
-        @info "Including CloudGraphsDFG"
-        # Include the Cloudgraphs API
-        include("CloudGraphsDFG/CloudGraphsDFG.jl")
-    end
-
     @require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
         @info "Including Plots"
         include("DFGPlots/DFGPlots.jl")

test/Project.toml

@@ -45,7 +45,9 @@ end
 
 if get(ENV, "IIF_TEST", "") == "true"
 
-    Pkg.add("IncrementalInference")
+    # Pkg.add("IncrementalInference")
+    # TODO: Remove this once we move to v0.5.0
+    Pkg.add(PackageSpec(name="IncrementalInference", rev="enhancement/compare_move_dfg"))
     @info "------------------------------------------------------------------------"
     @info "These tests are using IncrementalInference to do additional driver tests"
     @info "------------------------------------------------------------------------"