From 1ad08345dbef346fcca6a7cf057fbda42d47e5ed Mon Sep 17 00:00:00 2001 From: Chris Foster Date: Fri, 5 Nov 2021 14:16:43 +1000 Subject: [PATCH] CI + docs refresh to new julia versions * Update CI to run on recent Julia versions * Updated Documenter version + jldoctest blocks for Julia 1.6 --- .github/workflows/ci.yml | 5 ++-- docs/Manifest.toml | 56 ++++++++++++++++++++-------------------- docs/src/index.md | 10 +++---- src/Underscores.jl | 6 ++--- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db364b..a76a963 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,8 @@ jobs: matrix: version: - '1.0' - - '1.3' + - '1.6' + - '1' os: - ubuntu-latest - macOS-latest @@ -38,7 +39,7 @@ jobs: - uses: actions/checkout@v1 - uses: julia-actions/setup-julia@latest with: - version: '1.3' + version: '1.6' - run: julia --project=docs -e ' using Pkg; Pkg.develop(PackageSpec(; path=pwd())); diff --git a/docs/Manifest.toml b/docs/Manifest.toml index f3a18fa..7b785aa 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -1,5 +1,10 @@ # This file is machine-generated - editing it directly is not advised +[[ANSIColoredPrinters]] +git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" +uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" +version = "0.0.1" + [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -7,21 +12,23 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - [[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a" +deps = ["LibGit2"] +git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.1" +version = "0.8.6" [[Documenter]] -deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "51f0c7df46abb9c07d80e529718951e634670afb" +deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] +git-tree-sha1 = "f425293f7e0acaf9144de6d731772de156676233" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.24.4" +version = "0.27.10" + +[[IOCapture]] +deps = ["Logging", "Random"] +git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" +uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" +version = "0.2.2" [[InteractiveUtils]] deps = ["Markdown"] @@ -29,16 +36,14 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" +git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.0" +version = "0.21.2" [[LibGit2]] +deps = ["Base64", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -49,22 +54,21 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[NetworkOptions]] +uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" + [[Parsers]] -deps = ["Dates", "Test"] -git-tree-sha1 = "0139ba59ce9bc680e2925aec5b7db79065d60556" +deps = ["Dates"] +git-tree-sha1 = "ae4bbcadb2906ccc085cf52ac286dc1377dceccc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "0.3.10" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +version = "2.1.2" [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[Random]] @@ -81,12 +85,8 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/docs/src/index.md b/docs/src/index.md index 05e797a..b74e2a7 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -25,7 +25,7 @@ collection, broadcasting syntax would be awkward. Instead we can use: ```jldoctest julia> @_ map(_[end-1], [[1,2,3], [4,5]]) -2-element Array{Int64,1}: +2-element Vector{Int64}: 2 4 ``` @@ -35,7 +35,7 @@ function. To sum the last two elements of the arrays from the previous example: ```jldoctest julia> @_ map(_[end] + _[end-1], [[1,2,3], [4,5]]) -2-element Array{Int64,1}: +2-element Vector{Int64}: 5 9 ``` @@ -48,7 +48,7 @@ example, ```jldoctest julia> @_ map("X $_2 $(repeat(_1,_2))", ["a","b","c"], [1,2,3]) -3-element Array{String,1}: +3-element Vector{String}: "X 1 a" "X 2 bb" "X 3 ccc" @@ -65,7 +65,7 @@ julia> table = [(x="a", y=1), (x="c", y=3)]; julia> @_ filter(!startswith(_.x, "a"), table) -2-element Array{NamedTuple{(:x, :y),Tuple{String,Int64}},1}: +2-element Vector{NamedTuple{(:x, :y), Tuple{String, Int64}}}: (x = "b", y = 2) (x = "c", y = 3) ``` @@ -78,7 +78,7 @@ becomes particularly neat. In the following, think of `__` as the table, and julia> @_ table |> filter(!startswith(_.x, "a"), __) |> map(_.y, __) -2-element Array{Int64,1}: +2-element Vector{Int64}: 2 3 ``` diff --git a/src/Underscores.jl b/src/Underscores.jl index 0abab01..8de3db1 100644 --- a/src/Underscores.jl +++ b/src/Underscores.jl @@ -157,7 +157,7 @@ a collection: ```jldoctest julia> @_ map(_[end-1], [[1,2,3], [4,5]]) -2-element Array{Int64,1}: +2-element Vector{Int64}: 2 4 ``` @@ -166,7 +166,7 @@ If you need to repeat an argument more than once, just use `_` multiple times: ```jldoctest julia> @_ map(_^_, [1,2,3]) -3-element Array{Int64,1}: +3-element Vector{Int64}: 1 4 27 @@ -184,7 +184,7 @@ julia> table = [(x="a", y=1), julia> @_ table |> filter(!startswith(_.x, "a"), __) |> map(_.y, __) -2-element Array{Int64,1}: +2-element Vector{Int64}: 2 3 ```