Skip to content

Commit a0a03f3

Browse files
authored
Re-enable JET at Project level (#442)
Currently JET is disabled (see #437), but making a new release in this state would be a breaking change. (JET itself is currently broken, but that's a separate issue.) So we have to do something to put the package back in a suitable state without breaking the ability to build docs, etc. This reverses most of the parts of #437 that disabled JET, though there are still a couple of deliberately-missing pieces: - there's a commented-out line in `workflows/ci.yml` - `docs/make.jl` comments-out the build of the JET tutorial
1 parent 8f39873 commit a0a03f3

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

Project.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
1717

1818
[weakdeps]
1919
Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f"
20-
# JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
20+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
2121
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
2222
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
2323

@@ -26,7 +26,7 @@ SnoopCompileCore = {path = "SnoopCompileCore"}
2626

2727
[extensions]
2828
CthulhuExt = "Cthulhu"
29-
# JETExt = ["JET", "Cthulhu"]
29+
JETExt = ["JET", "Cthulhu"]
3030
SCPrettyTablesExt = "PrettyTables"
3131
SCPyPlotExt = "PyPlot"
3232

@@ -36,7 +36,7 @@ CodeTracking = "1.3.9, 2"
3636
Cthulhu = "2.17.6"
3737
FlameGraphs = "1"
3838
InteractiveUtils = "1"
39-
# JET = "0.9, 0.10"
39+
JET = "0.9, 0.10"
4040
MethodAnalysis = "1"
4141
OrderedCollections = "1"
4242
Pkg = "1"
@@ -55,7 +55,7 @@ julia = "1.12"
5555
[extras]
5656
Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f"
5757
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
58-
# JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
58+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
5959
MethodAnalysis = "85b6ec6f-f7df-4429-9514-a64bcd9ee824"
6060
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
6161
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
@@ -64,5 +64,4 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
6464
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6565

6666
[targets]
67-
# test = ["Cthulhu", "PrettyTables", "Documenter", "JET", "MethodAnalysis", "Pkg", "Random", "REPL", "Test"]
68-
test = ["Cthulhu", "PrettyTables", "Documenter", "MethodAnalysis", "Pkg", "Random", "REPL", "Test"]
67+
test = ["Cthulhu", "PrettyTables", "Documenter", "JET", "MethodAnalysis", "Pkg", "Random", "REPL", "Test"]

docs/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
33
Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f"
44
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
5-
# JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
5+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
66
MethodAnalysis = "85b6ec6f-f7df-4429-9514-a64bcd9ee824"
77
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
88
SnoopCompile = "aa65fe97-06da-5843-b5b1-d5d13cad87d2"
@@ -16,7 +16,7 @@ SnoopCompileCore = {path = "../SnoopCompileCore"}
1616
AbstractTrees = "0.4"
1717
Cthulhu = "2"
1818
Documenter = "1"
19-
# JET = "0.9"
19+
JET = "0.9, 0.10"
2020
MethodAnalysis = "0.4"
2121
PyPlot = "2"
2222
SnoopCompile = "3"

test/extensions/cthulhu.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ using Cthulhu.Testing
66
using Pkg
77
using Test
88

9+
# NOTE: the Cthulhu test is handled specially in `.github/workflows/ci.yml`
10+
911
macro with_try_stderr(out, expr)
1012
quote
1113
try

test/extensions/jet.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ using SnoopCompile
33
using Test
44
using JET, Cthulhu
55

6+
# NOTE: the JET test is handled specially in `.github/workflows/ci.yml`
7+
68
@testset "JET integration" begin
79
function mysum(c) # vendor a simple version of `sum`
810
isempty(c) && return zero(eltype(c))

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Test
22
using SnoopCompile
33

4-
if !isempty(ARGS)
4+
if !isempty(ARGS) # `.github/workflows/ci.yml` sets ARGS to run these tests on CI, but they don't run by default from `Pkg.test`
55
"cthulhu" ARGS && include("extensions/cthulhu.jl")
66
"jet" ARGS && include("extensions/jet.jl")
77
else

0 commit comments

Comments
 (0)