Skip to content

Requires-ify UI deps #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 9 additions & 33 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

julia_version = "1.7.3"
manifest_format = "2.0"
project_hash = "5ba2b95d6ceff51529a7cbdb1ff8926d49138671"

[[deps.Artifacts]]
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
Expand All @@ -22,23 +21,11 @@ git-tree-sha1 = "2fba81a302a7be671aefe194f0525ef231104e7f"
uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
version = "0.1.8"

[[deps.ColorTypes]]
deps = ["FixedPointNumbers", "Random"]
git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
version = "0.11.4"

[[deps.Colors]]
deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
git-tree-sha1 = "fc08e5930ee9a4e03f84bfb5211cb54e7769758a"
uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
version = "0.12.10"

[[deps.Compat]]
deps = ["Dates", "LinearAlgebra", "UUIDs"]
git-tree-sha1 = "5ce999a19f4ca23ea484e92a1774a61b8ca4cf8e"
git-tree-sha1 = "e460f044ca8b99be31d35fe54fc33a5c33dd8ed7"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "4.8.0"
version = "4.9.0"

[[deps.CompilerSupportLibraries_jll]]
deps = ["Artifacts", "Libdl"]
Expand All @@ -57,9 +44,9 @@ version = "1.15.0"

[[deps.DataStructures]]
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
git-tree-sha1 = "cf25ccb972fec4e4817764d01c82386ae94f77b4"
git-tree-sha1 = "3dbd312d370723b6bb43ba9d02fc36abade4518d"
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
version = "0.18.14"
version = "0.18.15"

[[deps.Dates]]
deps = ["Printf"]
Expand All @@ -75,21 +62,15 @@ git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
version = "0.9.3"

[[deps.FixedPointNumbers]]
deps = ["Statistics"]
git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
version = "0.8.4"

[[deps.InteractiveUtils]]
deps = ["Markdown"]
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[deps.InverseFunctions]]
deps = ["Test"]
git-tree-sha1 = "eabe3125edba5c9c10b60a160b1779a000dc8b29"
git-tree-sha1 = "68772f49f54b479fa88ace904f6127f0a3bb2e46"
uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
version = "0.1.11"
version = "0.1.12"

[[deps.IrrationalConstants]]
git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
Expand Down Expand Up @@ -128,9 +109,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"

[[deps.MemPool]]
deps = ["DataStructures", "Distributed", "Mmap", "Random", "Serialization", "Sockets"]
git-tree-sha1 = "096f99e66b8cdf44fa95ee9e2d7971e0264e4ec3"
git-tree-sha1 = "b9c1a032c3c1310a857c061ce487c632eaa1faa4"
uuid = "f9f48841-c794-520a-933b-121f7ba6ed94"
version = "0.4.3"
version = "0.4.4"

[[deps.Missings]]
deps = ["DataAPI"]
Expand Down Expand Up @@ -165,11 +146,6 @@ uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
deps = ["SHA", "Serialization"]
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[[deps.Reexport]]
git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
uuid = "189a3867-3050-52da-a836-e630ba90ab69"
version = "1.2.2"

[[deps.Requires]]
deps = ["UUIDs"]
git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
Expand Down Expand Up @@ -221,7 +197,7 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[[deps.TimespanLogging]]
deps = ["Distributed", "Profile"]
path = "lib/TimespanLogging"
git-tree-sha1 = "51be7dd35b0c8a5a613dc7af272d587ea6943d24"
uuid = "a526e669-04d3-4846-9525-c66122c55f63"
version = "0.1.0"

Expand Down
7 changes: 3 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ uuid = "d58978e5-989f-55fb-8d15-ea34adc7bf54"
version = "0.18.0"

[deps]
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
ContextVariablesX = "6add18c4-b38d-439d-96f6-d6bc489c04c5"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Expand All @@ -22,7 +21,6 @@ TimespanLogging = "a526e669-04d3-4846-9525-c66122c55f63"
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[compat]
Colors = "0.10, 0.11, 0.12"
ContextVariablesX = "0.1"
DataStructures = "0.18"
MacroTools = "0.5"
Expand All @@ -33,8 +31,9 @@ TimespanLogging = "0.1"
julia = "1.7"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Pkg"]
test = ["Colors", "Test", "Pkg"]
19 changes: 11 additions & 8 deletions src/Dagger.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ include("array/sparse_partition.jl")
include("array/sort.jl")

# Other
include("ui/graph.jl")
include("ui/graph-core.jl")
include("ui/gantt-common.jl")
include("ui/gantt-text.jl")

Expand All @@ -66,13 +66,16 @@ function __init__()
# Initialize system UUID
system_uuid()

@require Luxor="ae8d54c2-7ccd-5906-9d76-62fc9837b5bc" begin
# Gantt chart renderer
include("ui/gantt-luxor.jl")
end
@require Mux="a975b10e-0019-58db-a62f-e48ff68538c9" begin
# Gantt chart HTTP server
include("ui/gantt-mux.jl")
@require Colors="5ae59095-9a9b-59fe-a467-6f913c188581" begin
include("ui/graph.jl")
@require Luxor="ae8d54c2-7ccd-5906-9d76-62fc9837b5bc" begin
# Gantt chart renderer
include("ui/gantt-luxor.jl")
end
@require Mux="a975b10e-0019-58db-a62f-e48ff68538c9" begin
# Gantt chart HTTP server
include("ui/gantt-mux.jl")
end
end
@require ProfileSVG="132c30aa-f267-4189-9183-c8a63c7e05e6" begin
# Profile renderer
Expand Down
3 changes: 3 additions & 0 deletions src/ui/graph-core.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export show_plan

function show_plan end
7 changes: 4 additions & 3 deletions src/ui/graph.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Colors
import TimespanLogging: Timespan
import .Colors

export show_plan
import .Dagger
import .Dagger: show_plan
import .Dagger.TimespanLogging: Timespan

### DAG-based graphing

Expand Down
1 change: 1 addition & 0 deletions test/logging.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import TimespanLogging
import TimespanLogging: Timespan, Event, Events, LocalEventLog, MultiEventLog
import Colors

@testset "Logging" begin
@testset "LocalEventLog" begin
Expand Down