Skip to content

Commit 2cc3312

Browse files
committed
Update Travis and Docs
1 parent 953c7b1 commit 2cc3312

File tree

4 files changed

+34
-16
lines changed

4 files changed

+34
-16
lines changed

Diff for: .travis.yml

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: julia
2+
23
os:
34
- linux
45
- osx
6+
57
julia:
6-
- 0.7
78
- 1.0
9+
- 1.4
810
- nightly
911

1012
codecov: true
@@ -13,7 +15,15 @@ coveralls: true
1315
notifications:
1416
email: false
1517

16-
after_success:
17-
- julia -e 'using Pkg; Pkg.add("Plots"); Pkg.add("GR"); Pkg.add("DataFrames"); Pkg.add("CSV")' # DocDeps
18-
- julia -e 'using Pkg; Pkg.add("Documenter")'
19-
- julia -e 'include(joinpath("docs", "make.jl"))'
18+
jobs:
19+
allow_failures:
20+
- julia: nightly
21+
include:
22+
- stage: "Documentation"
23+
julia: 1.4
24+
os: linux
25+
script:
26+
- export GKSwstype=100
27+
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
28+
- julia --project=docs/ docs/make.jl
29+
after_success: skip

Diff for: docs/Project.toml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[deps]
2+
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
3+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
4+
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
5+
GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
6+
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

Diff for: docs/make.jl

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
using Documenter, PairwiseListMatrices
22

33
makedocs(
4-
doctest = true,
5-
format = :html,
6-
sitename = "PairwiseListMatrices",
7-
modules = [PairwiseListMatrices],
8-
pages = [
4+
doctest=true,
5+
format=Documenter.HTML(
6+
prettyurls=get(ENV, "CI", nothing) == "true"
7+
),
8+
sitename="PairwiseListMatrices",
9+
modules=[PairwiseListMatrices],
10+
pages=[
911
"index.md",
1012
"api.md"
1113
]
1214
)
1315

1416
deploydocs(
15-
repo = "github.com/diegozea/PairwiseListMatrices.jl.git",
16-
target = "build",
17-
deps = nothing,
18-
make = nothing
17+
repo="github.com/diegozea/PairwiseListMatrices.jl.git",
18+
target="build",
19+
deps=nothing,
20+
make=nothing
1921
)

Diff for: src/plotrecipes.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
function _getxyz(plm::PairwiseListMatrix{T,D,TV}) where {T,D,TV}
44
names = getlabels(plm)
5-
names, names, Matrix(plm)
5+
names, names, Matrix{T}(plm)
66
end
77

88
function _getxyz(nplm::NamedArray{T,2,PairwiseListMatrix{T,D,TV},DN}) where {T,D,TV,DN}
99
names = getlabels(nplm)
10-
names, names, Matrix(nplm.array)
10+
names, names, Matrix{T}(nplm.array)
1111
end
1212

1313
# ---------------------------------- MATRIX ---------------------------------- #

0 commit comments

Comments
 (0)