diff --git a/REQUIRE b/REQUIRE index afdd061..b0e1095 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ -julia 0.6 +julia 0.7-alpha Compat Conda PyCall 1.16 diff --git a/ci/before_script.jl b/ci/before_script.jl index a1511da..44472a4 100644 --- a/ci/before_script.jl +++ b/ci/before_script.jl @@ -1,10 +1,4 @@ -@static if VERSION >= v"0.7.0-" - using Pkg -else - macro info(x) - :(info($(esc(x)))) - end -end +using Pkg # Let PyCall.jl use Python interpreter from Conda.jl # See: https://github.com/JuliaPy/PyCall.jl diff --git a/ci/show_versions.jl b/ci/show_versions.jl index 9288941..00f60d1 100644 --- a/ci/show_versions.jl +++ b/ci/show_versions.jl @@ -1,10 +1,3 @@ -if VERSION >= v"0.7.0-" - using Pkg - show(stdout, "text/plain", Pkg.installed()) - println() -else - for line in split(strip(readstring("REQUIRE")), '\n')[2:end] - name = split(line)[1] - println(name, "\t", Pkg.installed(name)) - end -end +using Pkg +show(stdout, "text/plain", Pkg.installed()) +println() diff --git a/src/convenience.jl b/src/convenience.jl index 33149b4..7705e8d 100644 --- a/src/convenience.jl +++ b/src/convenience.jl @@ -1,8 +1,4 @@ -@static if VERSION >= v"0.7.0-" - using InteractiveUtils: versioninfo -else - versioninfo(io; verbose=false) = Base.versioninfo(io, verbose) -end +using InteractiveUtils: versioninfo function envinfo(io::IO = stdout; verbosity::Int = 1) if verbosity > 0 diff --git a/src/core.jl b/src/core.jl index 969dea0..e9b52a0 100644 --- a/src/core.jl +++ b/src/core.jl @@ -2,7 +2,7 @@ using PyCall import Conda julia_exepath() = - joinpath(VERSION < v"0.7.0-DEV.3073" ? JULIA_HOME : Base.Sys.BINDIR, + joinpath(Base.Sys.BINDIR, Base.julia_exename()) function eval_str(code::String) diff --git a/src/julia_repl.jl b/src/julia_repl.jl index 3dc3889..b9a6eb7 100644 --- a/src/julia_repl.jl +++ b/src/julia_repl.jl @@ -1,9 +1,5 @@ -@static if VERSION >= v"0.7.0-" - using REPL - using REPL: LineEdit -else - using Base: REPL, LineEdit -end +using REPL +using REPL: LineEdit # Register keybind '.' in Julia REPL: diff --git a/test/preamble.jl b/test/preamble.jl index d56aab6..3067b3b 100644 --- a/test/preamble.jl +++ b/test/preamble.jl @@ -1,8 +1,4 @@ -@static if VERSION < v"0.7.0-DEV.2005" - using Base.Test -else - using Test -end +using Test macro test_nothrow(ex) quote diff --git a/test/test_julia_repl.jl b/test/test_julia_repl.jl index ccd97a9..30e0b8c 100644 --- a/test/test_julia_repl.jl +++ b/test/test_julia_repl.jl @@ -3,11 +3,7 @@ module TestJuliaREPL include("preamble.jl") using IPython: init_repl, init_repl_if_not, REPL -@static if VERSION >= v"0.7.0-" - using REPL: TextTerminal -else - using Base.Terminals: TextTerminal -end +using REPL: TextTerminal @testset "init_repl_if_not" begin @@ -24,12 +20,8 @@ struct DummyTerminal <: TextTerminal end function dummy_repl() - if VERSION >= v"0.7.0-" - hascolor = false - repl = REPL.LineEditREPL(DummyTerminal(), hascolor) - else - repl = REPL.LineEditREPL(DummyTerminal()) - end + hascolor = false + repl = REPL.LineEditREPL(DummyTerminal(), hascolor) repl.interface = REPL.setup_interface(repl) return repl end