drop 0.6 support in master (JuliaLang#726)

Author: stevengj

.travis.yml

@@ -3,10 +3,11 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
+  - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false
-after_success:
-  - julia --color=yes -e 'cd(Pkg.dir("IJulia")); Pkg.add("Coverage"); using Coverage;
-    Coveralls.submit(Coveralls.process_folder())'
+#after_success:
+#  - julia --color=yes -e 'cd(Pkg.dir("IJulia")); Pkg.add("Coverage"); using Coverage;
+#    Coveralls.submit(Coveralls.process_folder())'

README.md

@@ -18,7 +18,7 @@ the [NBInclude](https://github.com/stevengj/NBInclude.jl) package.)
 
 ## Installation
 
-First, [download Julia](http://julialang.org/downloads/) *version 0.6
+First, [download Julia](http://julialang.org/downloads/) *version 0.7
 or later* and run the installer.  Then run the Julia application
 (double-click on it); a window with a `julia>` prompt will appear.  At
 the prompt, type:
@@ -74,7 +74,7 @@ session instead of opening a new one.
 
 ```julia
 julia> using IJulia; notebook(detached=true)
-Process(`'C:\Users\JuliaUser\.julia\v0.6\Conda\deps\usr\Scripts\jupyter' notebook`, ProcessRunning)
+Process(`'C:\Users\JuliaUser\.julia\v0.7\Conda\deps\usr\Scripts\jupyter' notebook`, ProcessRunning)
 
 julia>
 ```
@@ -143,7 +143,7 @@ disabled, you can do:
 using IJulia
 IJulia.installkernel("Julia nodeps", "--depwarn=no")
 ```
-and a kernel called `Julia nodeps 0.6` (if you are using Julia 0.6)
+and a kernel called `Julia nodeps 0.7` (if you are using Julia 0.7)
 will be installed (will show up in your main Jupyter kernel menu) that
 lets you open notebooks with this flag.
 
@@ -281,9 +281,9 @@ On Mac and Windows systems, it is currently easiest to use the
   you will need to install [PyQt4](http://www.riverbankcomputing.com/software/pyqt/download) or
   [PySide](http://qt-project.org/wiki/Category:LanguageBindings::PySide).
 
-* You need Julia version 0.6 or later.
+* You need Julia version 0.7 or later.
 
-Once IPython 3.0+ and Julia 0.6+ are installed, you can install IJulia from a Julia console by typing:
+Once IPython 3.0+ and Julia 0.7+ are installed, you can install IJulia from a Julia console by typing:
 ```julia
 Pkg.add("IJulia")
 ```
@@ -299,8 +299,8 @@ Most people will use the notebook (browser-based) interface, but you
 can also use the IPython
 [qtconsole](http://ipython.org/ipython-doc/dev/interactive/qtconsole.html)
 or IPython terminal interfaces by running `ipython qtconsole --kernel
-julia-0.6` or `ipython console --kernel julia-0.6`, respectively.
-(Replace `0.6` with whatever major Julia version you are using.)
+julia-0.7` or `ipython console --kernel julia-0.7`, respectively.
+(Replace `0.7` with whatever major Julia version you are using.)
 
 ## Debugging IJulia problems
 

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.6
+julia 0.7
 MbedTLS 0.4.3
 JSON 0.17
 ZMQ 0.6.0

appveyor.yml

@@ -1,9 +1,18 @@
 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
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# # Uncomment the following lines to allow failures on nightly julia
+# # (tests will run but not make your overall status red)
+# matrix:
+#   allow_failures:
+#   - julia_version: nightly
 
 branches:
   only:
@@ -17,36 +26,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:
-  - C:\projects\julia\bin\julia -e "
-      if VERSION >= v\"0.7.0-DEV.3630\";
-          using InteractiveUtils;
-          versioninfo(verbose=true);
-      else
-          versioninfo(true);
-      end;
-      VERSION >= v\"0.7.0-DEV.5183\" && using Pkg;
-      Pkg.clone(pwd(), \"IJulia\");
-      Pkg.add(\"Conda\"); using Conda;
-      try Conda.add(\"qt\"); catch end;
-      postlink = normpath(Pkg.dir(\"Conda\"), \"deps/usr/pkgs/qt-4.8.7-vc9_9/Scripts/.qt-post-link.bat\");
-      isfile(postlink) && rm(postlink);
-      Pkg.build(\"IJulia\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "
-      VERSION >= v\"0.7.0-DEV.5183\" && using Pkg;
-      Pkg.test(\"IJulia\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

src/IJulia.jl

@@ -36,13 +36,11 @@ module IJulia
 export notebook, installkernel
 
 using ZMQ, JSON, Compat, SoftGlobalScope
-import Compat.invokelatest
-using Compat.Unicode: uppercase, lowercase
-import Compat.Dates
-using Compat.Dates: now
-import Compat.Random
-using Compat.Base64: Base64EncodePipe
-using Compat.REPL
+import Base.invokelatest
+using Dates: now
+import Random
+using Base64: Base64EncodePipe
+import REPL
 
 const depfile = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
 isfile(depfile) || error("IJulia not properly installed. Please run Pkg.build(\"IJulia\")")

src/execute_request.jl

@@ -3,9 +3,7 @@
 # returning results.
 
 import Base.Libc: flush_cstdio
-if VERSION ≥ v"0.7"
-    import Pkg
-end
+import Pkg
 
 const text_plain = MIME("text/plain")
 const image_svg = MIME("image/svg+xml")
@@ -62,20 +60,16 @@ const displayqueue = Any[]
 
 # remove x from the display queue
 function undisplay(x)
-    i = Compat.findfirst(isequal(x), displayqueue)
+    i = findfirst(isequal(x), displayqueue)
     i !== nothing && splice!(displayqueue, i)
     return x
 end
 
-if VERSION < v"0.7.0-DEV.3498" # julia #25544
-    import Base.REPL: ip_matches_func
-else
-    import Base: ip_matches_func
-end
+import Base: ip_matches_func
 
 function show_bt(io::IO, top_func::Symbol, t, set)
     # follow PR #17570 code in removing top_func from backtrace
-    eval_ind = Compat.findlast(addr->ip_matches_func(addr, top_func), t)
+    eval_ind = findlast(addr->ip_matches_func(addr, top_func), t)
     eval_ind !== nothing && (t = t[1:eval_ind-1])
     Base.show_backtrace(io, t)
 end
@@ -84,19 +78,6 @@ end
 # doesn't support keyword arguments.
 showerror_nobt(io, e, bt) = showerror(io, e, bt, backtrace=false)
 
-@static if VERSION < v"0.7.0-DEV.4724"
-		# https://github.com/JuliaLang/Compat.jl/pull/572
-    # thanks to https://github.com/jipolanco/WriteVTK.jl/commit/ea046493c7787ae651b5f629455aaf7bdaa000b1
-    rsplit(s::AbstractString; limit::Integer=0, keepempty::Bool=false) =
-        Base.rsplit(s)
-    rsplit(s::AbstractString, splitter; limit::Integer=0, keepempty::Bool=false) =
-        Base.rsplit(s, splitter; limit=limit, keep=keepempty)
-    split(s::AbstractString; limit::Integer=0, keepempty::Bool=false) =
-        Base.split(s)
-    split(s::AbstractString, splitter; limit::Integer=0, keepempty::Bool=false) =
-        Base.split(s, splitter; limit=limit, keep=keepempty)
-end
-
 # return the content of a pyerr message for exception e
 function error_content(e, bt=catch_backtrace();
                        backtrace_top::Symbol=SOFTSCOPE[] ? :softscope_include_string : :include_string,
@@ -130,11 +111,7 @@ execute_msg = Msg(["julia"], Dict("username"=>"jlkernel", "session"=>uuid4()), D
 # request
 const stdio_bytes = Ref(0)
 
-if VERSION < v"0.7.0-DEV.3589" # julia #25738
-    import Base.Docs: helpmode # added in 0.6, see julia #19858
-else
-    import REPL: helpmode
-end
+import REPL: helpmode
 
 # use a global array to accumulate "payloads" for the execute_reply message
 const execute_payloads = Dict[]
@@ -169,12 +146,11 @@ function execute_request(socket, msg)
                    m -> string(replace(m, r"^\s*;" => "Base.repl_cmd(`"),
                                "`, ", stdout_name, ")"))
 
-    if VERSION ≥ v"0.7"
-        # "] ..." cells are interpreted as pkg shell commands
-        if occursin(r"^\].*$", code)
-            code = "IJulia.Pkg.REPLMode.do_cmd(IJulia.minirepl[], \"" *
-                escape_string(code[2:end]) * "\"; do_rethrow=true)"
-        end
+
+    # "] ..." cells are interpreted as pkg shell commands
+    if occursin(r"^\].*$", code)
+        code = "IJulia.Pkg.REPLMode.do_cmd(IJulia.minirepl[], \"" *
+            escape_string(code[2:end]) * "\"; do_rethrow=true)"
     end
 
     # a cell beginning with "? ..." is interpreted as a help request

src/handlers.jl

@@ -51,31 +51,16 @@ ind2chr(m::Msg, str::String, i::Integer) = i == 0 ? 0 :
     VersionNumber(m.header["version"]) ≥ v"5.2" ? length(str, 1, i) : ind_to_utf16(str, i)
 #Compact display of types for Jupyterlab completion
 
-if VERSION ≥ v"0.7.0-DEV.3500" #25544
-    import REPL: REPLCompletions
-    import REPL.REPLCompletions: sorted_keywords, emoji_symbols, latex_symbols
-elseif isdefined(Main, :REPLCompletions)
-    import REPLCompletions
-    import REPLCompletions: sorted_keywords, emoji_symbols, latex_symbols
-else
-    const sorted_keywords = [
-        "abstract type", "baremodule", "begin", "break", "catch", "ccall",
-        "const", "continue", "do", "else", "elseif", "end", "export", "false",
-        "finally", "for", "function", "global", "if", "import",
-        "let", "local", "macro", "module", "mutable struct",
-        "primitive type", "quote", "return", "struct",
-        "true", "try", "using", "while"]
-    import Base: REPLCompletions
-    import Base.REPL.REPLCompletions: emoji_symbols, latex_symbols
-end
+import REPL: REPLCompletions
+import REPL.REPLCompletions: sorted_keywords, emoji_symbols, latex_symbols
 
 complete_type(::Type{<:Function}) = "function"
 complete_type(::Type{<:Type}) = "type"
 complete_type(::Type{<:Tuple}) = "tuple"
 
 function complete_type(T::DataType)
     s = string(T)
-    (Compat.textwidth(s) ≤ 20 || isempty(T.parameters)) && return s
+    (textwidth(s) ≤ 20 || isempty(T.parameters)) && return s
     buf = IOBuffer()
     print(buf, T.name)
     position(buf) > 19 && return String(take!(buf))

src/init.jl

@@ -1,25 +1,12 @@
 include(joinpath("..","deps","kspec.jl"))
 
-if VERSION < v"0.7.0-beta2.171" # julia#28295
-    seed!(s) = Random.srand(s)
-else
-    import Random: seed!
-end
+import Random: seed!
 
 # use our own random seed for msg_id so that we
 # don't alter the user-visible random state (issue #336)
 const IJulia_RNG = seed!(Random.MersenneTwister(0))
-@static if VERSION < v"0.7.0-DEV.3666" # julia#25819
-    uuid4() = repr(Random.uuid4(IJulia_RNG))
-else
-    import UUIDs
-    uuid4() = repr(UUIDs.uuid4(IJulia_RNG))
-end
-
-if VERSION < v"0.7.0-DEV.4445" # julia#26130
-    run(args...; wait=nothing) = wait === false ?
-        Base.spawn(args...) : Base.run(args...)
-end
+import UUIDs
+uuid4() = repr(UUIDs.uuid4(IJulia_RNG))
 
 const orig_stdin  = Ref{IO}()
 const orig_stdout = Ref{IO}()
@@ -57,14 +44,12 @@ end
 # for use with Pkg.do_cmd.  We have to roll our own to
 # make sure it uses the redirected stdout, and because
 # we don't have terminal support.
-if VERSION ≥ v"0.7"
-    import REPL
-    struct MiniREPL <: REPL.AbstractREPL
-        display::TextDisplay
-    end
-    REPL.REPLDisplay(repl::MiniREPL) = repl.display
-    const minirepl = Ref{MiniREPL}()
+import REPL
+struct MiniREPL <: REPL.AbstractREPL
+    display::TextDisplay
 end
+REPL.REPLDisplay(repl::MiniREPL) = repl.display
+const minirepl = Ref{MiniREPL}()
 
 
 function init(args)
@@ -134,9 +119,7 @@ function init(args)
         redirect_stderr(IJuliaStdio(stderr,"stderr"))
     end
     redirect_stdin(IJuliaStdio(stdin,"stdin"))
-    if VERSION ≥ v"0.7"
-        minirepl[] = MiniREPL(TextDisplay(stdout))
-    end
+    minirepl[] = MiniREPL(TextDisplay(stdout))
 
     if isdefined(Base, :CoreLogging)
         logger = Base.CoreLogging.SimpleLogger(Base.stderr)

src/kernel.jl

@@ -1,5 +1,5 @@
 import IJulia
-using IJulia.Compat.InteractiveUtils
+using InteractiveUtils
 
 # workaround #60:
 if IJulia.Compat.Sys.isapple()