Skip to content

Commit

Permalink
Drop Julia 0.6 (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
bicycle1885 authored Aug 13, 2018
1 parent 99a0a13 commit 9c74c3c
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 56 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.jl.cov
*.jl.*.cov
*.jl.mem
/Manifest.toml
24 changes: 11 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +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
# see https://discourse.julialang.org/t/is-there-a-problem-with-codecov-and-nightly/5517
# - nightly
notifications:
email: false
git:
depth: 99999999

- 0.7
- 1.0
- nightly
matrix:
allow_failures:
- julia: nightly

- julia: nightly
env:
- JULIA_PROJECT="@."
notifications:
email: false
after_success:
# push coverage results to Codecov
- julia -e 'cd(Pkg.dir("CodecBase")); 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,3 +1,2 @@
julia 0.6
Compat 0.59
TranscodingStreams 0.3.1
julia 0.7
TranscodingStreams 0.7
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.0
- julia_version: latest

## 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(), \"CodecBase\"); Pkg.build(\"CodecBase\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"CodecBase\")"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
4 changes: 0 additions & 4 deletions src/CodecBase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ import TranscodingStreams:
Codec,
Memory,
Error
using Compat:
undef,
isuppercase,
islowercase

macro unreachable()
:(@assert false "unreachable")
Expand Down
10 changes: 1 addition & 9 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
using CodecBase
if VERSION > v"0.7-"
using Test
else
using Base.Test
end
using Test
import TranscodingStreams:
TranscodingStream,
test_roundtrip_read,
test_roundtrip_write,
test_roundtrip_lines,
test_roundtrip_transcode

if isdefined(Base, :codeunits)
macro b_str(s) Vector(codeunits(unescape_string(s))) end
end

@testset "DecodeError" begin
error = CodecBase.DecodeError("basexx: invalid data")
@test error isa CodecBase.DecodeError
Expand Down

0 comments on commit 9c74c3c

Please sign in to comment.