Skip to content

Commit 508a1c0

Browse files
committed
Setting Neo4j as official dependency
1 parent 825bee8 commit 508a1c0

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

Project.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "DistributedFactorGraphs"
22
uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
3-
version = "0.4.1"
3+
version = "0.5.0"
44

55
[deps]
66
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -13,6 +13,7 @@ JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
1313
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
1414
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1515
MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
16+
Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
1617
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1718
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
1819
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -22,15 +23,15 @@ Distributions = "≥ 0.18"
2223
DocStringExtensions = "≥ 0.7"
2324
Graphs = "≥ 0.10.3"
2425
MetaGraphs = "≥ 0.6.4"
26+
Neo4j = "≥ 2.0.0"
2527
Reexport = "≥ 0.2"
2628
Requires = "≥ 0.5"
2729
julia = "0.7, 1"
2830

2931
[extras]
3032
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3133
GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
32-
Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
3334
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
3435

3536
[targets]
36-
test = ["Test", "GraphPlot", "Neo4j", "Pkg"]
37+
test = ["Test", "GraphPlot", "Pkg"]

src/DistributedFactorGraphs.jl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,13 @@ using .SymbolDFGs
8686
include("LightDFG/LightDFG.jl")
8787
@reexport using .LightDFGs
8888

89+
include("CloudGraphsDFG/CloudGraphsDFG.jl")
90+
8991
#supported in Memory fg types
9092
const InMemoryDFGTypes = Union{GraphsDFG, LightDFG}
9193
export InMemoryDFGTypes
9294

9395
function __init__()
94-
@info "Looking for @require modules"
95-
@require Neo4j="d2adbeaf-5838-5367-8a2f-e46d570981db" begin
96-
@info "Including CloudGraphsDFG"
97-
# Include the Cloudgraphs API
98-
include("CloudGraphsDFG/CloudGraphsDFG.jl")
99-
end
100-
10196
@require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
10297
@info "Including Plots"
10398
include("DFGPlots/DFGPlots.jl")

test/runtests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ end
4545

4646
if get(ENV, "IIF_TEST", "") == "true"
4747

48-
Pkg.add("IncrementalInference")
48+
# Pkg.add("IncrementalInference")
49+
# TODO: Remove this once we move to v0.5.0
50+
Pkg.add(PackageSpec(name="IncrementalInference", rev="enhancement/compare_move_dfg"))
4951
@info "------------------------------------------------------------------------"
5052
@info "These tests are using IncrementalInference to do additional driver tests"
5153
@info "------------------------------------------------------------------------"

0 commit comments

Comments
 (0)