Drop 0.6 support

Author: carstenbauer

.travis.yml

@@ -4,10 +4,14 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
+  - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false
+matrix:
+  allow_failures:
+    - julia: nightly
 # uncomment the following lines to override the default test script
 #script:
 #  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi

REQUIRE

@@ -1,5 +1,4 @@
-julia 0.6
-Compat 0.47.0
+julia 0.7
 BinDeps
 VersionParsing
 @osx Homebrew

appveyor.yml

@@ -1,43 +1,41 @@
 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
+
+matrix:
+  allow_failures:
+  - julia_version: nightly
 
 branches:
   only:
     - master
     - /release-.*/
 
-skip_commits:
-  message: /\[av skip\]/
-
 notifications:
   - provider: Email
     on_build_success: false
     on_build_failure: false
     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(), \"Git\"); Pkg.build(\"Git\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Git\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# Uncomment to support code coverage upload. Should only be enabled for packages
+# which would have coverage gaps without running on Windows
+on_success:
+  - echo "%JL_CODECOV_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

deps/build.jl

@@ -1,7 +1,4 @@
-using Compat
-using Compat: @info
-using Compat.Sys: isapple, islinux, iswindows
-
+using Base.Sys: isapple, islinux, iswindows
 using BinDeps
 using BinDeps: download_cmd, unpack_cmd, splittarpath
 

src/Git.jl

@@ -4,7 +4,6 @@ module Git
 #
 # some utility functions for working with git repos
 #
-using Compat
 using Base: shell_escape
 using VersionParsing
 export gitcmd # determined by deps/build.jl and saved in deps/deps.jl

test/gitutils.jl

@@ -1,24 +1,12 @@
 # This file was a part of Julia. License is MIT: http://julialang.org/license
 
-using Compat
-
-if VERSION >= v"0.7.0-DEV.3427"
-    function write_and_readchomp(data, cmd::Cmd)
-        p = open(cmd, "r+")
-        print(p.in, data)
-        close(p.in)
-        v = readchomp(p.out)
-        wait(p)
-        return v
-    end
-else
-    function write_and_readchomp(data, cmd::Cmd)
-        r, w, p = readandwrite(cmd)
-        print(w,data); close(w)
-        v = readchomp(r)
-        wait(p)
-        return v
-    end
+function write_and_readchomp(data, cmd::Cmd)
+    p = open(cmd, "r+")
+    print(p.in, data)
+    close(p.in)
+    v = readchomp(p.out)
+    wait(p)
+    return v
 end
 
 function mktree(d::Dict)

test/runtests.jl

@@ -1,8 +1,7 @@
 # This file was a part of Julia. License is MIT: http://julialang.org/license
 
 using Git
-using Compat
-using Compat.Test
+using Test
 
 include("gitutils.jl")
 
@@ -24,11 +23,7 @@ mktempdir() do dir
 
         contents = [nothing, "foo", "bar", Dict{Any,Any}("baz"=>"qux")]
         b = length(contents)
-        @static if VERSION >= v"0.7.0"
-            states = [Dict([(string(k, base=b, pad=6), contents[rem(div(k,b^p),b)+1]) for k=0:(b^3)^2-1]) for p=0:5]
-        else
-            states = [Dict([(base(b, k, 6), contents[rem(div(k,b^p),b)+1]) for k=0:(b^3)^2-1]) for p=0:5]
-        end
+        states = [Dict([(string(k, base=b, pad=6), contents[rem(div(k,b^p),b)+1]) for k=0:(b^3)^2-1]) for p=0:5]
 
         git_setup(states[1:3]...)
         try Git.transact() do