Skip to content

Commit bc72215

Browse files
fredrikekreararslan
authored andcommitted
Misc fixes: (#327)
- Enable Project.toml again - Use docs/Project.toml to build docs - Build docs from Julia v1.0 - Move Test and JLD2 to test-only dependencies - Remove unused test/REQUIRE
1 parent 8c76f50 commit bc72215

File tree

7 files changed

+22
-74
lines changed

7 files changed

+22
-74
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
docs/build/
44
docs/site/
55
.DS_Store
6+
/docs/Manifest.toml

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ notifications:
1010
email: false
1111
jobs:
1212
include:
13-
- stage: deploy
14-
julia: 0.7
13+
- stage: "Documentation"
14+
julia: 1.0
1515
os: linux
1616
script:
17-
- julia -e 'mv("_Project.toml", "Project.toml")'
18-
- julia -e 'import Pkg; Pkg.build()'
19-
- julia -e 'import Pkg; Pkg.add("Documenter")'
20-
- julia docs/make.jl
17+
- julia --project=docs -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()))'
18+
- julia --project=docs docs/make.jl
19+
after_success: skip
2120
after_success:
2221
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

Manifest.toml

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,30 @@
11
[[Base64]]
22
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
33

4-
[[BinaryProvider]]
5-
deps = ["Libdl", "Pkg", "SHA", "Test"]
6-
git-tree-sha1 = "2883bc1b389e3d57a134796c39c788db3f298cef"
7-
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
8-
version = "0.4.0"
9-
10-
[[CodecZlib]]
11-
deps = ["BinaryProvider", "Compat", "Libdl", "Test", "TranscodingStreams"]
12-
git-tree-sha1 = "82742ef572290f566c6fc6d977d87586a0d3d5f1"
13-
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
14-
version = "0.4.3"
15-
164
[[ColorTypes]]
175
deps = ["FixedPointNumbers", "Random", "Test"]
18-
git-tree-sha1 = "b45e62af8eabea138c381c04972c4b25d47e6c69"
6+
git-tree-sha1 = "0e3209ba7418aed732e5c3818076b4400ee36c08"
197
uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
208
version = "0.7.4"
219

22-
[[Compat]]
23-
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
24-
git-tree-sha1 = "277d3807440d9793421354b6680911fc95d91a84"
25-
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
26-
version = "1.0.1"
27-
28-
[[DataStructures]]
29-
deps = ["InteractiveUtils", "REPL", "Random", "Serialization", "Test"]
30-
git-tree-sha1 = "6e72a9098f5774601c8c8d6a4511a68270594910"
31-
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
32-
version = "0.11.0"
33-
3410
[[Dates]]
3511
deps = ["Printf"]
3612
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
3713

38-
[[DelimitedFiles]]
39-
deps = ["Mmap"]
40-
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
41-
4214
[[Distributed]]
4315
deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
4416
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
4517

46-
[[FileIO]]
47-
deps = ["Pkg", "Random", "Test"]
48-
git-tree-sha1 = "b80161b7e679a1241f9441ebfa60b62d4239cf99"
49-
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
50-
version = "1.0.1"
51-
5218
[[FixedPointNumbers]]
5319
deps = ["Pkg", "Test"]
54-
git-tree-sha1 = "31cbf24d537a217475b37274df05de09882b53f1"
20+
git-tree-sha1 = "b8045033701c3b10bf2324d7203404be7aef88ba"
5521
uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
56-
version = "0.5.2"
22+
version = "0.5.3"
5723

5824
[[InteractiveUtils]]
5925
deps = ["LinearAlgebra", "Markdown"]
6026
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
6127

62-
[[JLD2]]
63-
deps = ["CodecZlib", "DataStructures", "FileIO", "LinearAlgebra", "Mmap", "Printf", "Random", "Test"]
64-
git-tree-sha1 = "6dad82183badddcaa078f5ad2e3c3634939afca1"
65-
uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
66-
version = "0.1.0"
67-
6828
[[LibGit2]]
6929
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
7030

@@ -82,9 +42,6 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
8242
deps = ["Base64"]
8343
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
8444

85-
[[Mmap]]
86-
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
87-
8845
[[Pkg]]
8946
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
9047
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -113,31 +70,13 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
11370
[[Serialization]]
11471
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
11572

116-
[[SharedArrays]]
117-
deps = ["Distributed", "Mmap", "Random", "Serialization"]
118-
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
119-
12073
[[Sockets]]
12174
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
12275

123-
[[SparseArrays]]
124-
deps = ["LinearAlgebra", "Random"]
125-
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
126-
127-
[[Statistics]]
128-
deps = ["LinearAlgebra", "SparseArrays"]
129-
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
130-
13176
[[Test]]
13277
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
13378
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
13479

135-
[[TranscodingStreams]]
136-
deps = ["Pkg", "Random", "Test"]
137-
git-tree-sha1 = "530829b1099ad19067dad83d31f278cf81e68a51"
138-
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
139-
version = "0.6.1"
140-
14180
[[UUIDs]]
14281
deps = ["Random"]
14382
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
name = "Colors"
22
uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
3-
version = "0.9.2"
3+
version = "0.9.4"
44

55
[deps]
66
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
77
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
88
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
9-
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
109
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1110
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
11+
12+
[extras]
13+
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
1214
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
15+
16+
[targets]
17+
test = ["Test", "JLD2"]

docs/Project.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[deps]
2+
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3+
4+
[compat]
5+
Documenter = "~0.19"

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ makedocs(
1919
deploydocs(
2020
repo = "github.com/JuliaGraphics/Colors.jl.git",
2121
target = "build",
22-
julia = "0.7",
22+
julia = "1.0",
2323
osname = "linux",
2424
deps = nothing,
2525
make = nothing

test/REQUIRE

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)