Use Compat for Markdown/Pkg imports (#57)

JuliaDocs · Mar 26, 2018 · 6f47a2d · 6f47a2d
1 parent 3fb4c3d
commit 6f47a2d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/src/DocStringExtensions.jl b/src/DocStringExtensions.jl
@@ -78,7 +78,6 @@ module DocStringExtensions
 # Imports.
 
 using Compat
-@static if VERSION >= v"0.7.0-DEV.3656" using Pkg end
 
 
 # Exports.

diff --git a/src/utilities.jl b/src/utilities.jl
@@ -169,7 +169,7 @@ $(:SIGNATURES)
 Remove the `Pkg.dir` part of a file `path` if it exists.
 """
 function cleanpath(path::AbstractString)
-    local pkgdir = joinpath(Pkg.dir(), "")
+    local pkgdir = joinpath(Compat.Pkg.dir(), "")
     return startswith(path, pkgdir) ? first(split(path, pkgdir; keep = false)) : path
 end
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,4 @@
 using DocStringExtensions
 using Compat.Test
-@static if VERSION >= v"0.7.0-DEV.3589" using Markdown end
 
 include("tests.jl")
diff --git a/test/tests.jl b/test/tests.jl
@@ -234,7 +234,7 @@ end
         end
     end
     @testset "templates" begin
-        let fmt = expr -> Markdown.plain(eval(:(@doc $expr)))
+        let fmt = expr -> Compat.Markdown.plain(eval(:(@doc $expr)))
             @test occursin("(DEFAULT)", fmt(:(TemplateTests.K)))
             @test occursin("(TYPES)", fmt(:(TemplateTests.T)))
             @test occursin("(METHODS, MACROS)", fmt(:(TemplateTests.f)))