From 8f910cbec5b2b24b9c55bed95e32275c34994969 Mon Sep 17 00:00:00 2001 From: JohnnyChen Date: Fri, 29 Mar 2019 13:21:10 +0800 Subject: [PATCH] upgrade to Documenter v0.22 --- .travis.yml | 2 +- docs/make.jl | 28 ++++++++++++++-------------- docs/src/function_reference.md | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 937da508..146bca09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ notifications: email: false script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia -e 'using Pkg; pkg"add Documenter Images AxisArrays Colors ColorTypes CoordinateTransformations Distances FileIO FixedPointNumbers ImageAxes ImageDraw ImageFeatures ImageFiltering ImageMagick ImageMetadata ImageSegmentation SimpleTraits TestImages Unitful"' + - julia -e 'using Pkg; pkg"add Documenter Images AxisArrays Colors ColorTypes CoordinateTransformations Distances FileIO FixedPointNumbers ImageAxes ImageDraw ImageFeatures ImageFiltering ImageMagick ImageMetadata ImageSegmentation SimpleTraits TestImages Unitful PaddedViews"' - julia --color=yes -e 'cd(ENV["TRAVIS_BUILD_DIR"]); ENV["DOCUMENTER_DEBUG"] = "true"; include(joinpath("docs", "make.jl"))' diff --git a/docs/make.jl b/docs/make.jl index 119bc718..c26f874e 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,10 +1,13 @@ -using Documenter, Images, ImageFiltering, ImageSegmentation, ImageFeatures +using Documenter, Images, ImageFiltering, ImageSegmentation, ImageFeatures, PaddedViews -makedocs(format = :html, - sitename = "JuliaImages", - assets = [joinpath("assets", "style.css"), +makedocs(modules = [Images, ImageCore, Colors, ColorTypes, FixedPointNumbers, ImageAxes, + ImageFeatures, ImageFiltering, ImageMetadata, + ImageSegmentation, ImageTransformations, PaddedViews, ImageMorphology ], - pages = ["Home"=>"index.md", + format = Documenter.HTML(edit_branch = "source", + assets = [joinpath("assets", "style.css")]); + sitename = "JuliaImages", + pages = ["Home" => "index.md", "install.md", "Manual" => Any[ "quickstart.md", @@ -18,21 +21,18 @@ makedocs(format = :html, "imagefeatures.md", "troubleshooting.md", ], - "Demos" => Any[ - "demos.md", - "demos/color_separations_svd.md", - "demos/rgb_hsv_thresholding.md", + "Demos" => Any[ + "demos.md", + "demos/color_separations_svd.md", + "demos/rgb_hsv_thresholding.md", ], "function_reference.md", "api_comparison.md", - ], - html_edit_branch = "source") + ]) deploydocs(repo = "github.com/JuliaImages/juliaimages.github.io.git", target = "build", branch = "master", - latest = "source", - julia = "1.0", - osname = "linux", + devbranch = "source", deps = nothing, make = nothing) diff --git a/docs/src/function_reference.md b/docs/src/function_reference.md index dcf241aa..51123407 100644 --- a/docs/src/function_reference.md +++ b/docs/src/function_reference.md @@ -380,7 +380,7 @@ match_keypoints #### Gray Level Co-occurence Matrix -```@docs +```julia glcm glcm_symmetric glcm_norm @@ -401,7 +401,7 @@ glcm_var_neighbour #### Local Binary Patterns -```@docs +```julia lbp modified_lbp direction_coded_lbp