Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to Documenter v0.22 #50

Merged
merged 2 commits into from
Mar 29, 2019
Merged

upgrade to Documenter v0.22 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f910cb
upgrade to Documenter v0.22
johnnychen94 Mar 29, 2019
ffeff5b
correct indents
johnnychen94 Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))'
21 changes: 10 additions & 11 deletions docs/make.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using Documenter, Images, ImageFiltering, ImageSegmentation, ImageFeatures
using Documenter, Images, ImageFiltering, ImageSegmentation, ImageFeatures, PaddedViews

makedocs(format = :html,
makedocs(modules = [Images, ImageCore, Colors, ColorTypes, FixedPointNumbers, ImageAxes,
ImageFeatures, ImageFiltering, ImageMetadata,
ImageSegmentation, ImageTransformations, PaddedViews, ImageMorphology],
format = Documenter.HTML(edit_branch = "source",
assets = [joinpath("assets", "style.css")]),
sitename = "JuliaImages",
assets = [joinpath("assets", "style.css"),
],
pages = ["Home"=>"index.md",
pages = ["Home" => "index.md",
"install.md",
"Manual" => Any[
"quickstart.md",
Expand All @@ -21,18 +23,15 @@ makedocs(format = :html,
"Demos" => Any[
"demos.md",
"demos/color_separations_svd.md",
"demos/rgb_hsv_thresholding.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)
4 changes: 2 additions & 2 deletions docs/src/function_reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ match_keypoints

#### Gray Level Co-occurence Matrix

```@docs
```julia
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the idea here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

related to JuliaImages/ImageFeatures.jl#61 I guess?

glcm
glcm_symmetric
glcm_norm
Expand All @@ -401,7 +401,7 @@ glcm_var_neighbour

#### Local Binary Patterns

```@docs
```julia
lbp
modified_lbp
direction_coded_lbp
Expand Down