Skip to content

Commit a2aae0b

Browse files
authored
Merge pull request #19 from JuliaParallel/mg/resources
Add new page about general resources: workshops, papers, etc..
2 parents 8ead322 + cae5b3f commit a2aae0b

File tree

7 files changed

+268
-41
lines changed

7 files changed

+268
-41
lines changed

.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,5 @@ deps/src/
2020
docs/build/
2121
docs/site/
2222

23-
# File generated by Pkg, the package manager, based on a corresponding Project.toml
24-
# It records a fixed state of all packages used by the project. As such, it should not be
25-
# committed for packages, but should be committed for applications that require a static
26-
# environment.
27-
# Manifest.toml
28-
__site
23+
__site/
24+
__cache/

Manifest.toml

Lines changed: 91 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,60 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.7.3"
3+
julia_version = "1.8.3"
44
manifest_format = "2.0"
5+
project_hash = "2b70c49215c1f0da05438c212275ceae0d85f3db"
56

67
[[deps.ArgTools]]
78
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
9+
version = "1.1.1"
810

911
[[deps.Artifacts]]
1012
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
1113

1214
[[deps.Base64]]
1315
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1416

17+
[[deps.BitFlags]]
18+
git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d"
19+
uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35"
20+
version = "0.1.7"
21+
1522
[[deps.CRC32c]]
1623
uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
1724

18-
[[deps.Crayons]]
19-
git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15"
20-
uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
21-
version = "4.1.1"
25+
[[deps.CodecZlib]]
26+
deps = ["TranscodingStreams", "Zlib_jll"]
27+
git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
28+
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
29+
version = "0.7.0"
2230

2331
[[deps.Dates]]
2432
deps = ["Printf"]
2533
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
2634

35+
[[deps.DelimitedFiles]]
36+
deps = ["Mmap"]
37+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
38+
2739
[[deps.Downloads]]
2840
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
2941
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
42+
version = "1.6.0"
3043

3144
[[deps.FileWatching]]
3245
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
3346

3447
[[deps.FranklinParser]]
3548
deps = ["REPL"]
36-
git-tree-sha1 = "34eab60f8bb982f55f40558a121ec5e50d5d254e"
49+
git-tree-sha1 = "21720fb3fb3ee04f9c1cb29944744d5dade2baa9"
3750
uuid = "796511e7-1510-466f-ad0c-1823c64bcafa"
38-
version = "0.6.0"
51+
version = "0.6.1"
3952

4053
[[deps.HTTP]]
41-
deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
42-
git-tree-sha1 = "0fa77022fe4b511826b39c894c90daf5fce3334a"
54+
deps = ["Base64", "CodecZlib", "Dates", "IniFile", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
55+
git-tree-sha1 = "e1acc37ed078d99a714ed8376446f92a5535ca65"
4356
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
44-
version = "0.9.17"
57+
version = "1.5.5"
4558

4659
[[deps.IOCapture]]
4760
deps = ["Logging", "Random"]
@@ -58,13 +71,21 @@ version = "0.5.1"
5871
deps = ["Markdown"]
5972
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
6073

74+
[[deps.JLLWrappers]]
75+
deps = ["Preferences"]
76+
git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
77+
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
78+
version = "1.4.1"
79+
6180
[[deps.LibCURL]]
6281
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
6382
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
83+
version = "0.6.3"
6484

6585
[[deps.LibCURL_jll]]
6686
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
6787
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
88+
version = "7.84.0+0"
6889

6990
[[deps.LibGit2]]
7091
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
@@ -73,19 +94,26 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
7394
[[deps.LibSSH2_jll]]
7495
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
7596
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
97+
version = "1.10.2+0"
7698

7799
[[deps.Libdl]]
78100
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
79101

80102
[[deps.LiveServer]]
81-
deps = ["Crayons", "FileWatching", "HTTP", "MIMEs", "Pkg", "Sockets", "Test"]
82-
git-tree-sha1 = "79783c2901a09bab202f55f24fe07a9a03b14e8a"
103+
deps = ["HTTP", "MIMEs", "Pkg", "Sockets"]
104+
git-tree-sha1 = "af11a3662103715954be5042747bd98cb1dc4229"
83105
uuid = "16fef848-5104-11e9-1b77-fb7a48bbb589"
84-
version = "0.8.3"
106+
version = "1.1.0"
85107

86108
[[deps.Logging]]
87109
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
88110

111+
[[deps.LoggingExtras]]
112+
deps = ["Dates", "Logging"]
113+
git-tree-sha1 = "cedb76b37bc5a6c702ade66be44f831fa23c681e"
114+
uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
115+
version = "1.0.0"
116+
89117
[[deps.MIMEs]]
90118
git-tree-sha1 = "65f28ad4b594aebe22157d6fac869786a255b7eb"
91119
uuid = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
@@ -96,20 +124,38 @@ deps = ["Base64"]
96124
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
97125

98126
[[deps.MbedTLS]]
99-
deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
100-
git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
127+
deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"]
128+
git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b"
101129
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
102-
version = "1.0.3"
130+
version = "1.1.7"
103131

104132
[[deps.MbedTLS_jll]]
105133
deps = ["Artifacts", "Libdl"]
106134
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
135+
version = "2.28.0+0"
136+
137+
[[deps.Mmap]]
138+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
107139

108140
[[deps.MozillaCACerts_jll]]
109141
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
142+
version = "2022.2.1"
110143

111144
[[deps.NetworkOptions]]
112145
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
146+
version = "1.2.0"
147+
148+
[[deps.OpenSSL]]
149+
deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"]
150+
git-tree-sha1 = "df6830e37943c7aaa10023471ca47fb3065cc3c4"
151+
uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
152+
version = "1.3.2"
153+
154+
[[deps.OpenSSL_jll]]
155+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
156+
git-tree-sha1 = "f6e9dba33f9f2c44e08a020b0caf6903be540004"
157+
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
158+
version = "1.1.19+0"
113159

114160
[[deps.OrderedCollections]]
115161
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
@@ -119,6 +165,13 @@ version = "1.4.1"
119165
[[deps.Pkg]]
120166
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
121167
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
168+
version = "1.8.0"
169+
170+
[[deps.Preferences]]
171+
deps = ["TOML"]
172+
git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
173+
uuid = "21216c6a-2e73-6563-6e65-726566657250"
174+
version = "1.3.0"
122175

123176
[[deps.Printf]]
124177
deps = ["Unicode"]
@@ -134,29 +187,43 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
134187

135188
[[deps.SHA]]
136189
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
190+
version = "0.7.0"
137191

138192
[[deps.Serialization]]
139193
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
140194

195+
[[deps.SimpleBufferStream]]
196+
git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
197+
uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
198+
version = "1.1.0"
199+
141200
[[deps.Sockets]]
142201
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
143202

144203
[[deps.TOML]]
145204
deps = ["Dates"]
146205
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
206+
version = "1.0.0"
147207

148208
[[deps.Tar]]
149209
deps = ["ArgTools", "SHA"]
150210
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
211+
version = "1.10.1"
151212

152213
[[deps.Test]]
153214
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
154215
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
155216

217+
[[deps.TranscodingStreams]]
218+
deps = ["Random", "Test"]
219+
git-tree-sha1 = "e4bdc63f5c6d62e80eb1c0043fcc0360d5950ff7"
220+
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
221+
version = "0.9.10"
222+
156223
[[deps.URIs]]
157-
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
224+
git-tree-sha1 = "ac00576f90d8a259f2c9d823e91d1de3fd44d348"
158225
uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
159-
version = "1.3.0"
226+
version = "1.4.1"
160227

161228
[[deps.UUIDs]]
162229
deps = ["Random", "SHA"]
@@ -167,20 +234,23 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
167234

168235
[[deps.Xranklin]]
169236
deps = ["CRC32c", "Dates", "FranklinParser", "IOCapture", "LiveServer", "Logging", "OrderedCollections", "Pkg", "REPL", "Serialization", "TOML", "URIs"]
170-
git-tree-sha1 = "40e2ff898170175d5f7406929464341230f968e2"
171-
repo-rev = "dev"
172-
repo-url = "https://github.com/tlienart/Xranklin.jl"
237+
git-tree-sha1 = "c670f07826b330c83893ef753ed2ad44ae801ef3"
238+
repo-rev = "main"
239+
repo-url = "https://github.com/tlienart/Xranklin.jl.git"
173240
uuid = "558449b0-171e-4e1f-900f-d076a5ddf486"
174241
version = "0.1.0"
175242

176243
[[deps.Zlib_jll]]
177244
deps = ["Libdl"]
178245
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
246+
version = "1.2.12+3"
179247

180248
[[deps.nghttp2_jll]]
181249
deps = ["Artifacts", "Libdl"]
182250
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
251+
version = "1.48.0+0"
183252

184253
[[deps.p7zip_jll]]
185254
deps = ["Artifacts", "Libdl"]
186255
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
256+
version = "17.4.0+0"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name = "juliaparallelwebsite"
21
uuid = "537948fd-c279-4aaa-8db0-b48e0ca81a15"
32
authors = ["Julia Lab"]
43
version = "0.1.0"
54

65
[deps]
6+
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
77
Xranklin = "558449b0-171e-4e1f-900f-d076a5ddf486"

README.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,39 @@
11
# https://juliaparallel.org
2+
3+
## For contributors
4+
5+
Clone the repository and `cd` to the new directory. Edit the files as you need. To test the
6+
website locally, start julia with `julia --project` and do
7+
8+
```julia
9+
julia> import Pkg
10+
11+
julia> Pkg.instantiate()
12+
13+
julia> import Xranklin
14+
15+
julia> Xranklin.serve()
16+
Activating project at `~/repo/juliaparallel.github.io`
17+
[ Info: 📓 de-serializing global context...
18+
[ Info: ⌛ processing config.md
19+
[ Info: ... [config.md] ✔ (δt = 2.1s)
20+
[ Info: 📓 de-serializing 0 local contexts...
21+
[ Info: 💡 de-serialization done (δt = 2.7s)
22+
23+
[ Info: 💡 starting the full pass
24+
25+
[ Info: > Full Pass [MD/1]
26+
[ Info: > Full Pass [MD/I]
27+
[ Info: > Full Pass [MD/2]
28+
[ Info: > Full Pass [O]
29+
[ Info: 🧵 loop (n=1) over 121 items
30+
31+
[ Info: 💡 full pass done (δt = 5.9s)
32+
33+
[ Info: Listening on: 127.0.0.1:8000
34+
✓ LiveServer listening on http://localhost:8000/ ...
35+
(use CTRL+C to shut down)
36+
```
37+
38+
Navigate to `localhost:8000` in a browser and you should see a preview of any modifications
39+
you make locally.

_layout/masthead.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a class="site-title" href="/">JuliaParallel</a>
77
<ul class="visible-links">
88
<li class="masthead__menu-item"><a href="/news/">News</a></li>
9-
<li class="masthead__menu-item"><a href="/teaching/">Teaching</a></li>
9+
<li class="masthead__menu-item"><a href="/resources/">Resources</a></li>
1010
<li class="masthead__menu-item"><a href="/tutorials/">Tutorials</a></li>
1111
<li class="masthead__menu-item"><a href="https://github.com/JuliaParallel">Github</a></li>
1212
</ul>

0 commit comments

Comments
 (0)