Skip to content

Commit

Permalink
Merge pull request #199 from JuliaParallel/vc/project
Browse files Browse the repository at this point in the history
add Project.toml and update travis
  • Loading branch information
vchuravy authored Apr 29, 2019
2 parents 33dca52 + 73ff0f6 commit 072661c
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 14 deletions.
27 changes: 22 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ os:
- osx
julia:
- 1.0
- 1.1
- nightly
matrix:
allow_failures:
Expand All @@ -13,8 +14,24 @@ branches:
- master
notifications:
email: false
before_install:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
after_success:
- julia -e 'import Pkg; cd(Pkg.dir("DistributedArrays")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())'
- 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"))'

jobs:
include:
- stage: "Documentation"
julia: 1.0
os: linux
script:
- export DOCUMENTER_DEBUG="true"
- julia --color=yes --project=docs/ -e 'using Pkg;
Pkg.instantiate();
Pkg.develop(PackageSpec(path=pwd()));
Pkg.build()'
- julia --color=yes --project=docs/ docs/make.jl
after_success: skip
- stage: "Coverage"
julia: 1.0
os: linux
after_success: # Intentionally rerun tests
- julia -e 'using Pkg; Pkg.add("Coverage")'
- julia -e 'using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'using Coverage; Codecov.submit(Codecov.process_folder())'
22 changes: 22 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name = "DistributedArrays"
uuid = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94"
version = "0.6.1"

[deps]
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Primes = "27ebfcd6-29c5-5fa9-bf4b-fb8fc14df3ae"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
julia = ">= 1.0"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"

[targets]
test = ["Test", "SparseArrays", "SpecialFunctions"]
2 changes: 0 additions & 2 deletions REQUIRE

This file was deleted.

3 changes: 3 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[deps]
DistributedArrays = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
7 changes: 1 addition & 6 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using Documenter, DistributedArrays

makedocs(
modules = [DistributedArrays],
format = :html,
format = Documenter.HTML(),
sitename = "DistributedArrays.jl",
pages = [
"Introduction" => "index.md"
Expand All @@ -13,9 +13,4 @@ makedocs(

deploydocs(
repo = "github.com/JuliaParallel/DistributedArrays.jl.git",
julia = "1.0",
# no need to build anything here, re-use output of `makedocs`
target = "build",
deps = nothing,
make = nothing
)
2 changes: 1 addition & 1 deletion src/broadcast.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##

using Base.Broadcast
import Base.Broadcast: BroadcastStyle, Broadcasted, _max
import Base.Broadcast: BroadcastStyle, Broadcasted

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

2 comments on commit 072661c

@vchuravy
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/426

After the above pull request is merged, it is recommended that you create
a tag on this repository for the registered package version:

git tag -a v0.6.1 -m "<description of version>" 072661ce675b1ff401122107701e80a31720992e
git push origin v0.6.1

Please sign in to comment.