Skip to content

Commit 238f4c2

Browse files
authored
Drop Julia 0.6 (#27)
1 parent 0aee068 commit 238f4c2

7 files changed

Lines changed: 27 additions & 66 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
deps/deps.jl
55
deps/src
66
deps/lib
7+
/Manifest.toml

.travis.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
# Documentation: http://docs.travis-ci.com/user/languages/julia/
1+
# Documentation: https://docs.travis-ci.com/user/languages/julia/
22
language: julia
33
os:
44
- linux
55
- osx
66
julia:
7-
- 0.6
7+
- 0.7
8+
- 1.0
89
- nightly
910
matrix:
1011
allow_failures:
1112
- julia: nightly
13+
env:
14+
- JULIA_PROJECT="@."
1215
notifications:
1316
email: false
14-
# uncomment the following lines to override the default test script
15-
#script:
16-
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
17-
# - julia -e 'Pkg.clone(pwd()); Pkg.build("CodecZlib"); Pkg.test("CodecZlib"; coverage=true)'
1817
after_success:
19-
# push coverage results to Codecov
20-
- if [ $TRAVIS_JULIA_VERSION != "nightly" ]; then julia -e 'cd(Pkg.dir("CodecZlib")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
18+
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
19+
- julia -e 'using Pkg; Pkg.add("Documenter"); include(joinpath("docs", "make.jl"))'

REQUIRE

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
julia 0.6.0
1+
julia 0.7
22
BinaryProvider 0.3
3-
Compat 0.62
4-
TranscodingStreams 0.5
3+
TranscodingStreams 0.6

appveyor.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
5-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
6-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
3+
- julia_version: 0.7
4+
- julia_version: 1.0
5+
- julia_version: latest
6+
7+
platform:
8+
- x86 # 32-bit
9+
- x64 # 64-bit
710

811
matrix:
912
allow_failures:
10-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
11-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
13+
- julia_version: latest
1214

1315
branches:
1416
only:
@@ -22,19 +24,12 @@ notifications:
2224
on_build_status_changed: false
2325

2426
install:
25-
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
26-
# Download most recent Julia Windows binary
27-
- ps: (new-object net.webclient).DownloadFile(
28-
$env:JULIA_URL,
29-
"C:\projects\julia-binary.exe")
30-
# Run installer silently, output to C:\projects\julia
31-
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
27+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
3228

3329
build_script:
34-
# Need to convert from shallow to complete for Pkg.clone to work
35-
- IF EXIST .git\shallow (git fetch --unshallow)
36-
- C:\projects\julia\bin\julia -e "versioninfo();
37-
Pkg.clone(pwd(), \"CodecZlib\"); Pkg.build(\"CodecZlib\")"
30+
- echo "%JL_BUILD_SCRIPT%"
31+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3832

3933
test_script:
40-
- C:\projects\julia\bin\julia -e "Pkg.test(\"CodecZlib\")"
34+
- echo "%JL_TEST_SCRIPT%"
35+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

deps/build.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using BinaryProvider # requires BinaryProvider 0.3.0 or later
2-
using Compat
3-
using Compat.Libdl
42

53
# Parse some basic command-line arguments
64
const verbose = "--verbose" in ARGS
@@ -45,22 +43,20 @@ function sourcebuild()
4543
end
4644
cd(joinpath(srcdir, z)) do
4745
run(`./configure --prefix=.`)
48-
make = Compat.Sys.isbsd() ? `gmake` : `make`
46+
make = Sys.isbsd() ? `gmake` : `make`
4947
run(`$make -j$(Sys.CPU_CORES)`)
5048
end
5149
found = false
5250
for f in readdir(joinpath(srcdir, z))
5351
if startswith(f, "libz." * Libdl.dlext)
5452
found = true
55-
Compat.cp(joinpath(srcdir, z, f), joinpath(libdir, f), force=true)
53+
cp(joinpath(srcdir, z, f), joinpath(libdir, f), force=true)
5654
end
5755
end
5856
found || error("zlib was unable to build properly")
5957
libz = joinpath(libdir, "libz." * Libdl.dlext)
6058
open(joinpath(@__DIR__, "deps.jl"), "w") do io
6159
println(io, """
62-
using Compat
63-
using Compat.Libdl
6460
function check_deps()
6561
ptr = Libdl.dlopen_e("$libz")
6662
loaded = ptr != C_NULL

src/CodecZlib.jl

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
VERSION < v"0.7.0-beta2.199" && __precompile__()
2-
31
module CodecZlib
42

53
export
@@ -29,13 +27,7 @@ import TranscodingStreams:
2927
initialize,
3028
finalize,
3129
splitkwargs
32-
33-
using Compat: Cvoid
34-
if VERSION < v"0.7.0-DEV.3382"
35-
using Base.Libdl
36-
else
37-
using Libdl
38-
end
30+
using Libdl
3931

4032
const libzpath = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
4133
if !isfile(libzpath)
@@ -48,20 +40,4 @@ include("libz.jl")
4840
include("compression.jl")
4941
include("decompression.jl")
5042

51-
# Deprecations
52-
# ------------
53-
54-
@deprecate GzipCompression GzipCompressor
55-
@deprecate GzipCompressionStream GzipCompressorStream
56-
@deprecate GzipDecompression GzipDecompressor
57-
@deprecate GzipDecompressionStream GzipDecompressorStream
58-
@deprecate ZlibCompression ZlibCompressor
59-
@deprecate ZlibCompressionStream ZlibCompressorStream
60-
@deprecate ZlibDecompression ZlibDecompressor
61-
@deprecate ZlibDecompressionStream ZlibDecompressorStream
62-
@deprecate DeflateCompression DeflateCompressor
63-
@deprecate DeflateCompressionStream DeflateCompressorStream
64-
@deprecate DeflateDecompression DeflateDecompressor
65-
@deprecate DeflateDecompressionStream DeflateDecompressorStream
66-
6743
end # module

test/runtests.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
using CodecZlib
2-
using Compat
3-
if VERSION < v"0.7-"
4-
using Base.Test
5-
else
6-
using Test
7-
end
2+
using Test
83
import TranscodingStreams:
94
TranscodingStreams,
105
TranscodingStream,

0 commit comments

Comments
 (0)