diff --git a/Project.toml b/Project.toml index a6fa44f..a1f6518 100644 --- a/Project.toml +++ b/Project.toml @@ -5,23 +5,21 @@ version = "0.6.0" [deps] DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" SimpleTraits = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" +CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193" +EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615" +ParserCombinator = "fae87a5f-d1ad-5cf0-8f61-c941e1580b46" [compat] EzXML = "1" +CodecZlib = "0.7" Graphs = "1.4" ParserCombinator = "2.1" -Requires = "1" SimpleTraits = "0.9" julia = "1" [extras] -CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193" -EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615" -Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6" -ParserCombinator = "fae87a5f-d1ad-5cf0-8f61-c941e1580b46" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["CodecZlib", "Graphs", "EzXML", "ParserCombinator", "Test"] +test = ["Test"] diff --git a/src/DOT/Dot.jl b/src/DOT/Dot.jl index 2e050bb..d4dbd05 100644 --- a/src/DOT/Dot.jl +++ b/src/DOT/Dot.jl @@ -1,6 +1,6 @@ module DOT -using GraphIO.ParserCombinator.Parsers +using ParserCombinator.Parsers using Graphs using Graphs: AbstractGraphFormat diff --git a/src/GEXF/Gexf.jl b/src/GEXF/Gexf.jl index 363b0c9..ce2135e 100644 --- a/src/GEXF/Gexf.jl +++ b/src/GEXF/Gexf.jl @@ -1,6 +1,6 @@ module GEXF -using GraphIO.EzXML +using EzXML using Graphs using Graphs: AbstractGraph, AbstractGraphFormat diff --git a/src/GML/Gml.jl b/src/GML/Gml.jl index cdf374c..e501d36 100644 --- a/src/GML/Gml.jl +++ b/src/GML/Gml.jl @@ -1,6 +1,6 @@ module GML -using GraphIO.ParserCombinator.Parsers +using ParserCombinator.Parsers using Graphs using Graphs: AbstractGraphFormat diff --git a/src/GraphIO.jl b/src/GraphIO.jl index 6f67734..e78282e 100644 --- a/src/GraphIO.jl +++ b/src/GraphIO.jl @@ -1,25 +1,10 @@ module GraphIO -using Requires - -#= - NOTE: This is a temporary fix until we can have multiple sub-packages with their own - requirements in a single repository. -=# -function __init__() - @require CodecZlib="944b1d66-785c-5afd-91f1-9de20f533193" begin - include("LGCompressed/LGCompressed.jl") - end - @require EzXML="8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615" begin - include("GEXF/Gexf.jl") - include("GraphML/GraphML.jl") - end - @require ParserCombinator="fae87a5f-d1ad-5cf0-8f61-c941e1580b46" begin - include("DOT/Dot.jl") - include("GML/Gml.jl") - end -end - +include("LGCompressed/LGCompressed.jl") +include("GEXF/Gexf.jl") +include("GraphML/GraphML.jl") +include("DOT/Dot.jl") +include("GML/Gml.jl") include("Graph6/Graph6.jl") include("NET/Net.jl") diff --git a/src/GraphML/GraphML.jl b/src/GraphML/GraphML.jl index 93ba5c7..8086ef6 100644 --- a/src/GraphML/GraphML.jl +++ b/src/GraphML/GraphML.jl @@ -1,6 +1,6 @@ module GraphML -using GraphIO.EzXML +using EzXML using Graphs using Graphs: AbstractGraphFormat diff --git a/src/LGCompressed/LGCompressed.jl b/src/LGCompressed/LGCompressed.jl index 15a6231..7cbb5f6 100644 --- a/src/LGCompressed/LGCompressed.jl +++ b/src/LGCompressed/LGCompressed.jl @@ -1,6 +1,6 @@ module LGCompressed -using GraphIO.CodecZlib +using CodecZlib using Graphs using Graphs: AbstractGraphFormat