Skip to content

Commit

Permalink
Drop Julia 0.6 (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
bicycle1885 authored Aug 13, 2018
1 parent 80f05ca commit 38439f4
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 54 deletions.
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
## Documentation: http://docs.travis-ci.com/user/languages/julia/
# Documentation: https://docs.travis-ci.com/user/languages/julia/
language: julia
os:
- linux
- osx
julia:
- 0.6
- 0.7
- 1.0
- nightly
matrix:
allow_failures:
- julia: nightly
env:
- JULIA_PROJECT="@."
notifications:
email: false
## uncomment the following lines to override the default test script
#script:
# - julia -e 'Pkg.clone(pwd()); Pkg.build("CodecXz"); Pkg.test("CodecXz"; coverage=true)'
after_success:
# push coverage results to Codecov
- if [ $TRAVIS_JULIA_VERSION != "nightly" ]; then julia -e 'cd(Pkg.dir("CodecXz")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
5 changes: 2 additions & 3 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
julia 0.6
julia 0.7
BinaryProvider 0.3
Compat 0.62
TranscodingStreams 0.5
TranscodingStreams 0.6
42 changes: 15 additions & 27 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
- julia_version: 0.7
- julia_version: 1
- julia_version: nightly

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
#matrix:
# allow_failures:
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
platform:
- x86 # 32-bit
- x64 # 64-bit

matrix:
allow_failures:
- julia_version: latest

branches:
only:
Expand All @@ -24,24 +24,12 @@ notifications:
on_build_status_changed: false

install:
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
# If there's a newer build queued for the same PR, cancel this one
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
throw "There are newer queued builds for this pull request, failing early." }
# Download most recent Julia Windows binary
- ps: (new-object net.webclient).DownloadFile(
$env:JULIA_URL,
"C:\projects\julia-binary.exe")
# Run installer silently, output to C:\projects\julia
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

build_script:
# Need to convert from shallow to complete for Pkg.clone to work
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "versioninfo();
Pkg.clone(pwd(), \"CodecXz\"); Pkg.build(\"CodecXz\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"CodecXz\")"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
11 changes: 1 addition & 10 deletions src/CodecXz.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
__precompile__()

module CodecXz

export
Expand All @@ -8,8 +6,6 @@ export
XzDecompressor,
XzDecompressorStream

using Compat: Cvoid
using Compat.Libdl
import TranscodingStreams:
TranscodingStreams,
TranscodingStream,
Expand All @@ -18,6 +14,7 @@ import TranscodingStreams:
initialize,
finalize,
splitkwargs
using Libdl

const liblzmapath = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
if !isfile(liblzmapath)
Expand All @@ -30,10 +27,4 @@ include("liblzma.jl")
include("compression.jl")
include("decompression.jl")

# Deprecations
@deprecate XzCompression XzCompressor
@deprecate XzCompressionStream XzCompressorStream
@deprecate XzDecompression XzDecompressor
@deprecate XzDecompressionStream XzDecompressorStream

end # module
9 changes: 2 additions & 7 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
using CodecXz
if VERSION < v"0.7-"
using Base.Test
else
using Test
end
using Compat
import TranscodingStreams
using TranscodingStreams
using Test

@testset "Xz Codec" begin
codec = XzCompressor()
Expand Down

0 comments on commit 38439f4

Please sign in to comment.