diff --git a/.travis.yml b/.travis.yml index cd60dfd..70b9d3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ os: - linux - osx julia: - - 0.7 - 1.0 + - 1 sudo: false notifications: email: false diff --git a/appveyor.yml b/appveyor.yml index c8c967e..5150cd5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: matrix: - - julia_version: 0.7 + - julia_version: 1.0 - julia_version: 1 - julia_version: nightly @@ -12,7 +12,7 @@ platform: # # (tests will run but not make your overall status red) matrix: allow_failures: - - julia_version: latest + - julia_version: nightly branches: only: diff --git a/src/Logger/websocketlogger.jl b/src/Logger/websocketlogger.jl index 1d308a7..96f4c7f 100644 --- a/src/Logger/websocketlogger.jl +++ b/src/Logger/websocketlogger.jl @@ -11,6 +11,10 @@ import Base.CoreLogging: logmsg_code, _min_enabled_level, current_logger_for_env, logging_error +if VERSION >= v"1.1" + import Base.CoreLogging: _invoked_shouldlog +end + import Base.string_with_env const Wslog = LogLevel(50) """ diff --git a/test/test_websocketlogger.jl b/test/test_websocketlogger.jl index 31f7234..d11d77c 100644 --- a/test/test_websocketlogger.jl +++ b/test/test_websocketlogger.jl @@ -202,37 +202,37 @@ import Base.CoreLogging: Info, │ exception = │ DivideError: integer division error │ Stacktrace: - │ [1] func1() at""") + │ $(VERSION < v"1.6" ? "" : " ")[1] func1()""") @testset "Limiting large data structures" begin @test genmsg("msg", a=fill(1.00001, 100,100), b=fill(2.00002, 10,10)) == - replace(""" + """ ┌ PREFIX msg │ a = - │ 100×100 Array{Float64,2}: + │ 100×100 $(Matrix{Float64}): │ 1.00001 1.00001 1.00001 1.00001 … 1.00001 1.00001 1.00001 │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 - │ ⋮ ⋱ EOL + │ ⋮ ⋱ $(VERSION < v"1.1" ? " " : "") │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 │ b = - │ 10×10 Array{Float64,2}: + │ 10×10 $(Matrix{Float64}): │ 2.00002 2.00002 2.00002 2.00002 … 2.00002 2.00002 2.00002 │ 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 │ 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 - │ ⋮ ⋱ EOL + │ ⋮ ⋱ $(VERSION < v"1.1" ? " " : "") │ 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 │ 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 2.00002 └ SUFFIX - """, "EOL"=>"") # EOL hack to work around git whitespace errors + """ # Limiting the amount which is printed @test genmsg("msg", a=fill(1.00001, 10,10), show_limited=false) == """ ┌ PREFIX msg │ a = - │ 10×10 Array{Float64,2}: + │ 10×10 $(Matrix{Float64}): │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 │ 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001 1.00001