Drop 0.6 from master. (#65)

Author: fredrikekre

.travis.yml

@@ -7,7 +7,6 @@ os:
 sudo: false
 
 julia:
-  - 0.6
   - 0.7
   - 1.0
   - nightly
@@ -16,13 +15,14 @@ notifications:
   email: false
 
 after_success:
-  - julia -e 'include(Pkg.dir("DocStringExtensions", "test", "coverage.jl"))'
+  - julia test/coverage.jl
 
 jobs:
   include:
     - stage: "Deploy docs"
-      julia: 0.6
+      julia: 1.0
       os: linux
-      script: julia -e 'Pkg.add("Documenter"); Pkg.checkout("Documenter")'
-        && julia ${TRAVIS_BUILD_DIR}/docs/make.jl
+      script:
+        - julia -e 'using Pkg; Pkg.add([PackageSpec("Documenter"), PackageSpec(path=pwd())])'
+        - julia docs/make.jl
       after_success: skip

README.md

@@ -2,16 +2,17 @@
 
 *Extensions for Julia's docsystem.*
 
-| **Documentation**                                                               | **PackageEvaluator**                                            | **Build Status**                                                                                |
-|:-------------------------------------------------------------------------------:|:---------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------:|
-| [![][docs-stable-img]][docs-stable-url] [![][docs-latest-img]][docs-latest-url] | [![][pkg-0.4-img]][pkg-0.4-url] [![][pkg-0.5-img]][pkg-0.5-url] [![][pkg-0.6-img]][pkg-0.6-url] [![][pkg-0.7-img]][pkg-0.7-url] | [![][travis-img]][travis-url] [![][appveyor-img]][appveyor-url] [![][codecov-img]][codecov-url] |
+| **Documentation**                                                               | **Build Status**                                                                                |
+|:-------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------:|
+| [![][docs-stable-img]][docs-stable-url] [![][docs-latest-img]][docs-latest-url] | [![][travis-img]][travis-url] [![][appveyor-img]][appveyor-url] [![][codecov-img]][codecov-url] |
 
 ## Installation
 
-The package is registered in `METADATA.jl` and so can be installed with `Pkg.add`.
+The package can be added using the Julia package manager. From the Julia REPL, type `]`
+to enter the Pkg REPL mode and run
 
-```julia
-julia> Pkg.add("DocStringExtensions")
+```
+pkg> add DocStringExtensions
 ```
 
 ## Documentation
@@ -21,7 +22,8 @@ julia> Pkg.add("DocStringExtensions")
 
 ## Project Status
 
-The package is tested against Julia `0.6` and `0.7-dev` on Linux, OS X, and Windows.
+The package is tested and developed against Julia `0.7` and `1.0` on Linux, OS X, and Windows,
+but there are versions of the package that works on older versions of Julia.
 
 ## Contributing and Questions
 
@@ -45,12 +47,3 @@ Contributions are very welcome, as are feature requests and suggestions. Please
 [codecov-url]: https://codecov.io/gh/JuliaDocs/DocStringExtensions.jl
 
 [issues-url]: https://github.com/JuliaDocs/DocStringExtensions.jl/issues
-
-[pkg-0.4-img]: http://pkg.julialang.org/badges/DocStringExtensions_0.4.svg
-[pkg-0.4-url]: http://pkg.julialang.org/?pkg=DocStringExtensions?ver=0.4
-[pkg-0.5-img]: http://pkg.julialang.org/badges/DocStringExtensions_0.5.svg
-[pkg-0.5-url]: http://pkg.julialang.org/?pkg=DocStringExtensions?ver=0.5
-[pkg-0.6-img]: http://pkg.julialang.org/badges/DocStringExtensions_0.6.svg
-[pkg-0.6-url]: http://pkg.julialang.org/?pkg=DocStringExtensions?ver=0.6
-[pkg-0.7-img]: http://pkg.julialang.org/badges/DocStringExtensions_0.7.svg
-[pkg-0.7-url]: http://pkg.julialang.org/?pkg=DocStringExtensions?ver=0.7

REQUIRE

@@ -1,2 +1 @@
-julia 0.6
-Compat 0.62
+julia 0.7

appveyor.yml

@@ -1,6 +1,5 @@
 environment:
   matrix:
-  - julia_version: 0.6
   - julia_version: 0.7
   - julia_version: 1
   - julia_version: nightly
@@ -13,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:
@@ -41,4 +40,4 @@ test_script:
 # # which would have coverage gaps without running on Windows
 # on_success:
 #   - echo "%JL_CODECOV_SCRIPT%"
-#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

docs/make.jl

@@ -1,6 +1,3 @@
-
-# Don't build docs on version 0.4 since they will fail.
-
 using Documenter, DocStringExtensions
 
 makedocs(
@@ -16,6 +13,6 @@ deploydocs(
     deps = nothing,
     make = nothing,
     repo = "github.com/JuliaDocs/DocStringExtensions.jl.git",
-    julia = "0.6",
+    julia = "1.0",
 )
 

src/DocStringExtensions.jl

@@ -75,11 +75,6 @@ $(IMPORTS)
 """
 module DocStringExtensions
 
-# Imports.
-
-using Compat
-
-
 # Exports.
 
 export @template, FIELDS, EXPORTS, METHODLIST, IMPORTS, SIGNATURES, TYPEDEF, DOCSTRING

src/abbreviations.jl

@@ -72,7 +72,6 @@ function format(::TypeFields, buf, doc)
     local object = Docs.resolve(binding)
     # On 0.7 fieldnames() on an abstract type throws an error. We then explicitly return
     # an empty vector to be consistent with the behaviour on v0.6.
-    # Compat necessary since Base.isabstract was introduced in v0.6.
     local fields = isabstracttype(object) ? Symbol[] : fieldnames(object)
     if !isempty(fields)
         println(buf)

src/utilities.jl

@@ -169,16 +169,11 @@ $(:SIGNATURES)
 Remove the `Pkg.dir` part of a file `path` if it exists.
 """
 function cleanpath(path::AbstractString)
-    @static if VERSION >= v"0.7.0-DEV.5183"
-        for depot in DEPOT_PATH
-            pkgdir = joinpath(depot, "")
-            startswith(path, pkgdir) && return first(split(path, pkgdir, keepempty=false))
-        end
-        return path
-    else
-        pkgdir = joinpath(Compat.Pkg.dir(), "")
-        return startswith(path, pkgdir) ? first(split(path, pkgdir; keep = false)) : path
+    for depot in DEPOT_PATH
+        pkgdir = joinpath(depot, "")
+        startswith(path, pkgdir) && return first(split(path, pkgdir, keepempty=false))
     end
+    return path
 end
 
 """
@@ -257,7 +252,7 @@ function keywords(func, m::Method)
             filter!(arg -> !occursin("#", string(arg)), kwargs)
             # Keywords *may* not be sorted correctly. We move the vararg one to the end.
             local index = findfirst(arg -> endswith(string(arg), "..."), kwargs)
-            if index != nothing && index > 0 # TODO: use Compat.findfirst later on
+            if index != nothing
                 kwargs[index], kwargs[end] = kwargs[end], kwargs[index]
             end
             return kwargs
@@ -309,10 +304,10 @@ on TravisCI as well.
 """
 url(m::Method) = url(m.module, string(m.file), m.line)
 
-import Compat.LibGit2
+import LibGit2
 
 function url(mod::Module, file::AbstractString, line::Integer)
-    file = Compat.Sys.iswindows() ? replace(file, '\\' => '/') : file
+    file = Sys.iswindows() ? replace(file, '\\' => '/') : file
     if Base.inbase(mod) && !isabspath(file)
         local base = "https://github.com/JuliaLang/julia/tree"
         if isempty(Base.GIT_VERSION_INFO.commit)

test/coverage.jl

@@ -1,7 +1,7 @@
 # Only run coverage from linux nightly build on travis.
 get(ENV, "TRAVIS_OS_NAME", "")       == "linux"   || exit()
 get(ENV, "TRAVIS_JULIA_VERSION", "") == "nightly" || exit()
-
+using Pkg
 Pkg.add("Coverage")
 using Coverage
 

test/runtests.jl

@@ -1,4 +1,5 @@
 using DocStringExtensions
-using Compat.Test
+using Test
+import Markdown
 
 include("tests.jl")