Skip to content

Commit 072661c

Browse files
authored
Merge pull request #199 from JuliaParallel/vc/project
add Project.toml and update travis
2 parents 33dca52 + 73ff0f6 commit 072661c

File tree

6 files changed

+49
-14
lines changed

6 files changed

+49
-14
lines changed

.travis.yml

+22-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ os:
44
- osx
55
julia:
66
- 1.0
7+
- 1.1
78
- nightly
89
matrix:
910
allow_failures:
@@ -13,8 +14,24 @@ branches:
1314
- master
1415
notifications:
1516
email: false
16-
before_install:
17-
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
18-
after_success:
19-
- julia -e 'import Pkg; cd(Pkg.dir("DistributedArrays")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())'
20-
- julia -e 'import Pkg; cd(Pkg.dir("DistributedArrays")); ps=Pkg.PackageSpec(name="Documenter", version="0.19"); Pkg.add(ps); Pkg.pin(ps); include(joinpath("docs", "make.jl"))'
17+
18+
jobs:
19+
include:
20+
- stage: "Documentation"
21+
julia: 1.0
22+
os: linux
23+
script:
24+
- export DOCUMENTER_DEBUG="true"
25+
- julia --color=yes --project=docs/ -e 'using Pkg;
26+
Pkg.instantiate();
27+
Pkg.develop(PackageSpec(path=pwd()));
28+
Pkg.build()'
29+
- julia --color=yes --project=docs/ docs/make.jl
30+
after_success: skip
31+
- stage: "Coverage"
32+
julia: 1.0
33+
os: linux
34+
after_success: # Intentionally rerun tests
35+
- julia -e 'using Pkg; Pkg.add("Coverage")'
36+
- julia -e 'using Coverage; Coveralls.submit(Coveralls.process_folder())'
37+
- julia -e 'using Coverage; Codecov.submit(Codecov.process_folder())'

Project.toml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name = "DistributedArrays"
2+
uuid = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94"
3+
version = "0.6.1"
4+
5+
[deps]
6+
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
7+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
8+
Primes = "27ebfcd6-29c5-5fa9-bf4b-fb8fc14df3ae"
9+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
10+
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
11+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
12+
13+
[compat]
14+
julia = ">= 1.0"
15+
16+
[extras]
17+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
18+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
19+
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
20+
21+
[targets]
22+
test = ["Test", "SparseArrays", "SpecialFunctions"]

REQUIRE

-2
This file was deleted.

docs/Project.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[deps]
2+
DistributedArrays = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94"
3+
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

docs/make.jl

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using Documenter, DistributedArrays
22

33
makedocs(
44
modules = [DistributedArrays],
5-
format = :html,
5+
format = Documenter.HTML(),
66
sitename = "DistributedArrays.jl",
77
pages = [
88
"Introduction" => "index.md"
@@ -13,9 +13,4 @@ makedocs(
1313

1414
deploydocs(
1515
repo = "github.com/JuliaParallel/DistributedArrays.jl.git",
16-
julia = "1.0",
17-
# no need to build anything here, re-use output of `makedocs`
18-
target = "build",
19-
deps = nothing,
20-
make = nothing
2116
)

src/broadcast.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##
44

55
using Base.Broadcast
6-
import Base.Broadcast: BroadcastStyle, Broadcasted, _max
6+
import Base.Broadcast: BroadcastStyle, Broadcasted
77

88
# We define a custom ArrayStyle here since we need to keep track of
99
# the fact that it is Distributed and what kind of underlying broadcast behaviour

0 commit comments

Comments
 (0)