Skip to content

Commit 977ae3c

Browse files
Improve setup of examples (#125)
* Update configuration documentation and example * Update package versions * Update docs/literate.jl Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix the documentation Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent d005664 commit 977ae3c

File tree

12 files changed

+466
-255
lines changed

12 files changed

+466
-255
lines changed

.github/workflows/CompatHelper.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
11
name: CompatHelper
22
on:
33
schedule:
4-
- cron: '00 00 * * *'
4+
- cron: 0 0 * * *
55
workflow_dispatch:
66
jobs:
77
CompatHelper:
88
runs-on: ubuntu-latest
99
steps:
10-
- name: Pkg.add("CompatHelper")
11-
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
12-
- name: CompatHelper.main()
10+
- name: "Add the General registry via Git"
11+
run: |
12+
import Pkg
13+
ENV["JULIA_PKG_SERVER"] = ""
14+
Pkg.Registry.add("General")
15+
shell: julia --color=yes {0}
16+
- name: "Install CompatHelper"
17+
run: |
18+
import Pkg
19+
name = "CompatHelper"
20+
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
21+
version = "3"
22+
Pkg.add(; name, uuid, version)
23+
shell: julia --color=yes {0}
24+
- name: "Run CompatHelper"
25+
run: |
26+
import CompatHelper
27+
subdirs = ["", "docs", "test/gpu"]
28+
for f in readdir("examples"; join=true)
29+
if isdir(f)
30+
push!(subdirs, joinpath("examples", basename(f)))
31+
end
32+
end
33+
@info "CompatHelper directories" subdirs
34+
CompatHelper.main(; subdirs=subdirs, bump_version=true)
35+
shell: julia --color=yes {0}
1336
env:
1437
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1538
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
16-
run: julia -e 'using CompatHelper; CompatHelper.main(; subdirs = ["", "docs", "docs/gpu", "examples/basic"])'

.github/workflows/Documentation.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ jobs:
2323
- uses: julia-actions/setup-julia@latest
2424
with:
2525
version: '1'
26-
- name: Install dependencies, build and deploy
26+
- name: Install dependencies
2727
run: |
2828
using Pkg: Pkg
29-
Pkg.develop(Pkg.PackageSpec(path=pwd()))
3029
Pkg.instantiate()
31-
include(joinpath(pwd(), "docs", "make.jl"))
30+
shell: julia --color=yes --project=docs/ {0}
31+
- name: Build and deploy
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
3434
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
3535
GKSwstype: nul # avoid (irrelevant) error messages from GR
36-
shell: julia --color=yes --project=docs/ {0}
36+
JULIA_DEBUG: Documenter # Print `@debug` statements (https://github.com/JuliaDocs/Documenter.jl/issues/955)
37+
run: julia --color=yes --project=docs/ docs/make.jl

docs/Manifest.toml

Lines changed: 85 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# This file is machine-generated - editing it directly is not advised
22

3+
[[ANSIColoredPrinters]]
4+
git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c"
5+
uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9"
6+
version = "0.0.1"
7+
8+
[[Adapt]]
9+
deps = ["LinearAlgebra"]
10+
git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7"
11+
uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
12+
version = "3.3.1"
13+
314
[[ArgTools]]
415
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
516

@@ -11,9 +22,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1122

1223
[[BenchmarkTools]]
1324
deps = ["JSON", "Logging", "Printf", "Statistics", "UUIDs"]
14-
git-tree-sha1 = "01ca3823217f474243cc2c8e6e1d1f45956fe872"
25+
git-tree-sha1 = "42ac5e523869a84eac9669eaceed9e4aa0e1587b"
1526
uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
16-
version = "1.0.0"
27+
version = "1.1.4"
1728

1829
[[Bzip2_jll]]
1930
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -23,9 +34,9 @@ version = "1.0.8+0"
2334

2435
[[ChainRulesCore]]
2536
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
26-
git-tree-sha1 = "8b31cc69cbc38c5c826aaa1c890c694be3622d99"
37+
git-tree-sha1 = "bdc0937269321858ab2a4f288486cb258b9a0af7"
2738
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
28-
version = "0.10.3"
39+
version = "1.3.0"
2940

3041
[[CodecBzip2]]
3142
deps = ["Bzip2_jll", "Libdl", "TranscodingStreams"]
@@ -41,24 +52,24 @@ version = "0.7.0"
4152

4253
[[Compat]]
4354
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
44-
git-tree-sha1 = "e4e2b39db08f967cc1360951f01e8a75ec441cab"
55+
git-tree-sha1 = "727e463cfebd0c7b999bbf3e9e7e16f254b94193"
4556
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
46-
version = "3.30.0"
57+
version = "3.34.0"
4758

4859
[[CompilerSupportLibraries_jll]]
4960
deps = ["Artifacts", "Libdl"]
5061
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
5162

5263
[[DataAPI]]
53-
git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d"
64+
git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385"
5465
uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
55-
version = "1.6.0"
66+
version = "1.7.0"
5667

5768
[[DataStructures]]
5869
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
59-
git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677"
70+
git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02"
6071
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
61-
version = "0.18.9"
72+
version = "0.18.10"
6273

6374
[[Dates]]
6475
deps = ["Printf"]
@@ -80,9 +91,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
8091

8192
[[Distributions]]
8293
deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
83-
git-tree-sha1 = "013020ec9a5cdf1dd454eba3704dbffa69d3047e"
94+
git-tree-sha1 = "f389cb8974e02d7eaa6ae2ccedbbfb43174cd8e8"
8495
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
85-
version = "0.25.3"
96+
version = "0.25.14"
8697

8798
[[DocStringExtensions]]
8899
deps = ["LibGit2"]
@@ -91,32 +102,32 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
91102
version = "0.8.5"
92103

93104
[[Documenter]]
94-
deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
95-
git-tree-sha1 = "5acbebf1be22db43589bc5aa1bb5fcc378b17780"
105+
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
106+
git-tree-sha1 = "350dced36c11f794c6c4da5dc6493ec894e50c16"
96107
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
97-
version = "0.27.0"
108+
version = "0.27.5"
98109

99110
[[Downloads]]
100111
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
101112
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
102113

103114
[[FillArrays]]
104-
deps = ["LinearAlgebra", "Random", "SparseArrays"]
105-
git-tree-sha1 = "31939159aeb8ffad1d4d8ee44d07f8558273120a"
115+
deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"]
116+
git-tree-sha1 = "7c365bdef6380b29cfc5caaf99688cd7489f9b87"
106117
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
107-
version = "0.11.7"
118+
version = "0.12.2"
108119

109120
[[HTTP]]
110-
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
111-
git-tree-sha1 = "86ed84701fbfd1142c9786f8e53c595ff5a4def9"
121+
deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
122+
git-tree-sha1 = "44e3b40da000eab4ccb1aecdc4801c040026aeb5"
112123
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
113-
version = "0.9.10"
124+
version = "0.9.13"
114125

115126
[[IOCapture]]
116-
deps = ["Logging"]
117-
git-tree-sha1 = "1868e4e7ad2f93d8de0904d89368c527b46aa6a1"
127+
deps = ["Logging", "Random"]
128+
git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
118129
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
119-
version = "0.2.1"
130+
version = "0.2.2"
120131

121132
[[IniFile]]
122133
deps = ["Test"]
@@ -128,6 +139,11 @@ version = "0.5.0"
128139
deps = ["Markdown"]
129140
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
130141

142+
[[IrrationalConstants]]
143+
git-tree-sha1 = "f76424439413893a832026ca355fe273e93bce94"
144+
uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
145+
version = "0.1.0"
146+
131147
[[IterativeSolvers]]
132148
deps = ["LinearAlgebra", "Printf", "Random", "RecipesBase", "SparseArrays"]
133149
git-tree-sha1 = "1a8c6237e78b714e901e406c096fc8a65528af7d"
@@ -142,9 +158,9 @@ version = "1.3.0"
142158

143159
[[JSON]]
144160
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
145-
git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4"
161+
git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37"
146162
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
147-
version = "0.21.1"
163+
version = "0.21.2"
148164

149165
[[JSONSchema]]
150166
deps = ["HTTP", "JSON", "ZipFile"]
@@ -175,17 +191,11 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
175191
deps = ["Libdl"]
176192
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
177193

178-
[[Literate]]
179-
deps = ["Base64", "IOCapture", "JSON", "REPL"]
180-
git-tree-sha1 = "501a1a74a0c825037860d36d87d703e987d39dbc"
181-
uuid = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
182-
version = "2.8.1"
183-
184194
[[LogExpFunctions]]
185-
deps = ["DocStringExtensions", "LinearAlgebra"]
186-
git-tree-sha1 = "1ba664552f1ef15325e68dc4c05c3ef8c2d5d885"
195+
deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
196+
git-tree-sha1 = "3d682c07e6dd250ed082f883dc88aee7996bf2cc"
187197
uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
188-
version = "0.2.4"
198+
version = "0.3.0"
189199

190200
[[Logging]]
191201
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -212,9 +222,9 @@ uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
212222

213223
[[Missings]]
214224
deps = ["DataAPI"]
215-
git-tree-sha1 = "4ea90bd5d3985ae1f9a908bd4500ae88921c5ce7"
225+
git-tree-sha1 = "2ca267b08821e86c5ef4376cffed98a46c2cb205"
216226
uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
217-
version = "1.0.0"
227+
version = "1.0.1"
218228

219229
[[Mmap]]
220230
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
@@ -224,9 +234,15 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
224234

225235
[[MutableArithmetics]]
226236
deps = ["LinearAlgebra", "SparseArrays", "Test"]
227-
git-tree-sha1 = "ad9b2bce6021631e0e20706d361972343a03e642"
237+
git-tree-sha1 = "3927848ccebcc165952dc0d9ac9aa274a87bfe01"
228238
uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
229-
version = "0.2.19"
239+
version = "0.2.20"
240+
241+
[[NNlib]]
242+
deps = ["Adapt", "ChainRulesCore", "Compat", "LinearAlgebra", "Pkg", "Requires", "Statistics"]
243+
git-tree-sha1 = "3bc876dbff74cc9c4ece84ef9326da8ccd71c98f"
244+
uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
245+
version = "0.7.28"
230246

231247
[[NetworkOptions]]
232248
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -238,10 +254,10 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
238254
version = "0.5.5+0"
239255

240256
[[OptimalTransport]]
241-
deps = ["Distances", "Distributions", "IterativeSolvers", "LinearAlgebra", "LogExpFunctions", "MathOptInterface", "PDMats", "QuadGK", "SparseArrays", "StatsBase"]
257+
deps = ["Distances", "Distributions", "IterativeSolvers", "LinearAlgebra", "LogExpFunctions", "MathOptInterface", "NNlib", "PDMats", "QuadGK", "SparseArrays", "StatsBase"]
242258
path = ".."
243259
uuid = "7e02d93a-ae51-4f58-b602-d97af76e3b33"
244-
version = "0.3.11"
260+
version = "0.3.15"
245261

246262
[[OrderedCollections]]
247263
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
@@ -250,15 +266,15 @@ version = "1.4.1"
250266

251267
[[PDMats]]
252268
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
253-
git-tree-sha1 = "f82a0e71f222199de8e9eb9a09977bd0767d52a0"
269+
git-tree-sha1 = "4dd403333bcf0909341cfe57ec115152f937d7d8"
254270
uuid = "90014a1f-27ba-587c-ab20-58faa44d9150"
255-
version = "0.11.0"
271+
version = "0.11.1"
256272

257273
[[Parsers]]
258274
deps = ["Dates"]
259-
git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc"
275+
git-tree-sha1 = "438d35d2d95ae2c5e8780b330592b6de8494e779"
260276
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
261-
version = "1.1.0"
277+
version = "2.0.3"
262278

263279
[[Pkg]]
264280
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -289,9 +305,20 @@ deps = ["Serialization"]
289305
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
290306

291307
[[RecipesBase]]
292-
git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae"
308+
git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e"
293309
uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
294-
version = "1.1.1"
310+
version = "1.1.2"
311+
312+
[[Reexport]]
313+
git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
314+
uuid = "189a3867-3050-52da-a836-e630ba90ab69"
315+
version = "1.2.2"
316+
317+
[[Requires]]
318+
deps = ["UUIDs"]
319+
git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621"
320+
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
321+
version = "1.1.3"
295322

296323
[[Rmath]]
297324
deps = ["Random", "Rmath_jll"]
@@ -320,19 +347,19 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
320347

321348
[[SortingAlgorithms]]
322349
deps = ["DataStructures"]
323-
git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96"
350+
git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508"
324351
uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
325-
version = "1.0.0"
352+
version = "1.0.1"
326353

327354
[[SparseArrays]]
328355
deps = ["LinearAlgebra", "Random"]
329356
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
330357

331358
[[SpecialFunctions]]
332359
deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"]
333-
git-tree-sha1 = "a50550fa3164a8c46747e62063b4d774ac1bcf49"
360+
git-tree-sha1 = "a322a9493e49c5f3a10b50df3aedaf1cdb3244b7"
334361
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
335-
version = "1.5.1"
362+
version = "1.6.1"
336363

337364
[[Statistics]]
338365
deps = ["LinearAlgebra", "SparseArrays"]
@@ -345,15 +372,15 @@ version = "1.0.0"
345372

346373
[[StatsBase]]
347374
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
348-
git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d"
375+
git-tree-sha1 = "fed1ec1e65749c4d96fc20dd13bea72b55457e62"
349376
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
350-
version = "0.33.8"
377+
version = "0.33.9"
351378

352379
[[StatsFuns]]
353-
deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"]
354-
git-tree-sha1 = "30cd8c360c54081f806b1ee14d2eecbef3c04c49"
380+
deps = ["IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"]
381+
git-tree-sha1 = "20d1bb720b9b27636280f751746ba4abb465f19d"
355382
uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
356-
version = "0.9.8"
383+
version = "0.9.9"
357384

358385
[[SuiteSparse]]
359386
deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]
@@ -373,9 +400,9 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
373400

374401
[[TranscodingStreams]]
375402
deps = ["Random", "Test"]
376-
git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c"
403+
git-tree-sha1 = "216b95ea110b5972db65aa90f88d8d89dcb8851c"
377404
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
378-
version = "0.9.5"
405+
version = "0.9.6"
379406

380407
[[URIs]]
381408
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"

docs/Project.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
[deps]
2-
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
32
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
4-
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
53
OptimalTransport = "7e02d93a-ae51-4f58-b602-d97af76e3b33"
64

75
[compat]
8-
Distributions = "0.25"
96
Documenter = "0.27"
10-
Literate = "2.8"
117
OptimalTransport = "0.3"
12-
julia = "1"

0 commit comments

Comments
 (0)