Skip to content

Commit 62c5519

Browse files
authored
Merge pull request #104 from staticfloat/sf/13_reasons_why
Upgrade to Julia 1.3+
2 parents 04afab9 + f692490 commit 62c5519

File tree

8 files changed

+96
-116
lines changed

8 files changed

+96
-116
lines changed

.travis.yml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
language: julia
22
os:
3-
- osx
4-
- linux
3+
- osx
4+
- linux
5+
- windows
56

67
julia:
7-
- 0.7
8-
- 1.0
9-
- nightly
10-
11-
# # uncomment the following lines to allow failures on nightly julia
12-
# # (tests will run but not make your overall status red)
13-
# matrix:
14-
# allow_failures:
15-
# - julia: 0.7
16-
# - julia: 1.0
17-
# - julia: nightly
8+
- 1.3
9+
- 1.4
10+
- nightly
1811

1912
notifications:
20-
email: false
13+
email: false
2114

2215
after_success:
23-
# submit test coverage
24-
- cd ${TRAVIS_BUILD_DIR}
25-
- julia -e 'using Pkg; Pkg.add("Coverage")'
26-
- julia -e 'using Coverage; Coveralls.submit(Coveralls.process_folder())'
16+
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())';

Manifest.toml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
[[Base64]]
4+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
5+
6+
[[Dates]]
7+
deps = ["Printf"]
8+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
9+
10+
[[GMP_jll]]
11+
deps = ["Libdl", "Pkg"]
12+
git-tree-sha1 = "4dd9301d3a027c05ec403e756ee7a60e3c367e5d"
13+
uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d"
14+
version = "6.1.2+5"
15+
16+
[[InteractiveUtils]]
17+
deps = ["Markdown"]
18+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
19+
20+
[[LibGit2]]
21+
deps = ["Printf"]
22+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
23+
24+
[[Libdl]]
25+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
26+
27+
[[Logging]]
28+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
29+
30+
[[Markdown]]
31+
deps = ["Base64"]
32+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
33+
34+
[[Nettle_jll]]
35+
deps = ["GMP_jll", "Libdl", "Pkg"]
36+
git-tree-sha1 = "10e4a49e5f6324b30e1d86ba024dd3a8afae59df"
37+
uuid = "4c82536e-c426-54e4-b420-14f461c4ed8b"
38+
version = "3.4.1+0"
39+
40+
[[Pkg]]
41+
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
42+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
43+
44+
[[Printf]]
45+
deps = ["Unicode"]
46+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
47+
48+
[[REPL]]
49+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
50+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
51+
52+
[[Random]]
53+
deps = ["Serialization"]
54+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
55+
56+
[[SHA]]
57+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
58+
59+
[[Serialization]]
60+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
61+
62+
[[Sockets]]
63+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
64+
65+
[[UUIDs]]
66+
deps = ["Random", "SHA"]
67+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
68+
69+
[[Unicode]]
70+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

Project.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name = "Nettle"
2+
uuid = "49dea1ee-f6fa-5aa6-9a11-8816cee7d4b9"
3+
authors = ["Elliot Saba <[email protected]>"]
4+
version = "0.5.0"
5+
6+
[deps]
7+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
8+
Nettle_jll = "4c82536e-c426-54e4-b420-14f461c4ed8b"
9+
10+
[compat]
11+
julia = "1.3"
12+
13+
[extras]
14+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
15+
16+
[targets]
17+
test = ["Test"]

appveyor.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

deps/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

deps/build.jl

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/Nettle.jl

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
module Nettle
2-
3-
# Load libnettle from our deps.jl
4-
const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
5-
if !isfile(depsjl_path)
6-
error("Nettle not installed properly, run Pkg.build(\"Nettle\"), restart Julia and try again")
7-
end
8-
include(depsjl_path)
2+
using Nettle_jll, Libdl
93

104
include("hash_common.jl")
115
include("hash.jl")
126
include("hmac.jl")
137
include("cipher.jl")
148

15-
function __init__()
16-
# Always check your dependencies that live in `deps.jl`
17-
check_deps()
18-
end
19-
209
# SnoopCompile acceleration
2110
include("precompile.jl")
2211
_precompile_()

src/precompile.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ function _precompile_()
2222
precompile(Nettle.update!, (Nettle.HMACState, String,))
2323
precompile(Nettle.encrypt, (String, Vector{UInt8}, Vector{UInt8},))
2424
precompile(Nettle.hexdigest!, (Nettle.Hasher,))
25-
precompile(Nettle.__init__, ())
2625
end

0 commit comments

Comments
 (0)