Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to julia 0.7-alpha #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch to julia 0.7-alpha #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adda77d
Switch to julia 0.7-alpha
tkf Aug 23, 2018
54295e3
Fix deprecations
femtocleaner[bot] Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
julia 0.6
julia 0.7-alpha
Compat
Conda
PyCall 1.16
8 changes: 1 addition & 7 deletions ci/before_script.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 3 additions & 10 deletions ci/show_versions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
6 changes: 1 addition & 5 deletions src/convenience.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 2 additions & 6 deletions src/julia_repl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
6 changes: 1 addition & 5 deletions test/preamble.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 3 additions & 11 deletions test/test_julia_repl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down