From 31c21821af69e08d00e2bc40f413b7aebdc90a50 Mon Sep 17 00:00:00 2001 From: Fons van der Plas Date: Mon, 21 Oct 2024 15:47:30 +0200 Subject: [PATCH 1/3] Julia 1.10 minimum --- .github/workflows/IntegrationTest.yml | 2 +- .github/workflows/test.yml | 6 +++--- Project.toml | 4 ++-- src/Errors.jl | 2 ++ test/Project.toml | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml index 229068e..1ce2607 100644 --- a/.github/workflows/IntegrationTest.yml +++ b/.github/workflows/IntegrationTest.yml @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} arch: x64 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dbdb45a..308d67c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: # Without setting this, a failing test cancels all others fail-fast: false matrix: - julia-version: ["1.6", "1", "~1.11.0-0", "nightly"] + julia-version: ["1.10", "1", "~1.12.0-0", "nightly"] os: [ubuntu-latest] steps: @@ -31,10 +31,10 @@ jobs: - uses: actions/checkout@v4 # Makes thes `julia` command available - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} - - uses: julia-actions/cache@v1 + - uses: julia-actions/cache@v2 # 🚗 - uses: julia-actions/julia-runtest@v1 diff --git a/Project.toml b/Project.toml index 3e3fc19..6a60d17 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "PlutoDependencyExplorer" uuid = "72656b73-756c-7461-726b-72656b6b696b" license = "MIT" authors = ["Paul Berg ", "Fons van der Plas "] -version = "1.0.4" +version = "1.0.5" [deps] ExpressionExplorer = "21656369-7473-754a-2065-74616d696c43" @@ -13,4 +13,4 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" ExpressionExplorer = "0.6, 1" InteractiveUtils = "1" Markdown = "1" -julia = "1.6" +julia = "1.10" diff --git a/src/Errors.jl b/src/Errors.jl index 78879e9..c768ff2 100644 --- a/src/Errors.jl +++ b/src/Errors.jl @@ -21,6 +21,8 @@ function MultipleDefinitionsError(topology::NotebookTopology, cell::AbstractCell MultipleDefinitionsError( union((defs(cell) ∩ defs(c) for c in competitors)...) ) + + error(123) end const _hint1 = "Combine all definitions into a single reactive cell using a `begin ... end` block." diff --git a/test/Project.toml b/test/Project.toml index 613fa15..e08ac9c 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -2,4 +2,5 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781" +PlutoDependencyExplorer = "72656b73-756c-7461-726b-72656b6b696b" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From 602fb26df6257444e086f3992d8a76acc09ce2ea Mon Sep 17 00:00:00 2001 From: Fons van der Plas Date: Mon, 21 Oct 2024 15:50:44 +0200 Subject: [PATCH 2/3] asdf --- src/Errors.jl | 2 -- test/pluto integration/helpers.jl | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Errors.jl b/src/Errors.jl index c768ff2..78879e9 100644 --- a/src/Errors.jl +++ b/src/Errors.jl @@ -21,8 +21,6 @@ function MultipleDefinitionsError(topology::NotebookTopology, cell::AbstractCell MultipleDefinitionsError( union((defs(cell) ∩ defs(c) for c in competitors)...) ) - - error(123) end const _hint1 = "Combine all definitions into a single reactive cell using a `begin ... end` block." diff --git a/test/pluto integration/helpers.jl b/test/pluto integration/helpers.jl index c3902ca..7efd6bd 100644 --- a/test/pluto integration/helpers.jl +++ b/test/pluto integration/helpers.jl @@ -31,7 +31,7 @@ function expecterror(err, cell; strict=true) msg = sprint(showerror, err) # UndefVarError(:x, #undef) - if err isa UndefVarError && !isdefined(err, :scope) && VERSION > v"1.10" + if err isa UndefVarError && !isdefined(err, :scope) && VERSION >= v"1.11" strict = false msg = first(split(msg, '\n'; limit=2)) end @@ -41,4 +41,4 @@ function expecterror(err, cell; strict=true) else return occursin(msg, cell.output.body[:msg]) end -end \ No newline at end of file +end From 65d31a22bcc137610f820854dd95f38f9e5c20e7 Mon Sep 17 00:00:00 2001 From: Fons van der Plas Date: Mon, 21 Oct 2024 15:54:34 +0200 Subject: [PATCH 3/3] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 308d67c..9864f57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: # Without setting this, a failing test cancels all others fail-fast: false matrix: - julia-version: ["1.10", "1", "~1.12.0-0", "nightly"] + julia-version: ["1.10", "1", "nightly"] # "~1.12.0-0"] os: [ubuntu-latest] steps: