From 73ff0f613f95a06c9f5bef38d75820b9cb84a491 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Mon, 29 Apr 2019 10:13:19 -0400
Subject: [PATCH] update .travis

---
 .travis.yml       | 27 ++++++++++++++++++++++-----
 Project.toml      | 22 ++++++++++++++++++++++
 REQUIRE           |  2 --
 docs/Project.toml |  3 +++
 docs/make.jl      |  7 +------
 src/broadcast.jl  |  2 +-
 6 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 Project.toml
 delete mode 100644 REQUIRE
 create mode 100644 docs/Project.toml

diff --git a/.travis.yml b/.travis.yml
index 3b92169..4057b1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ os:
   - osx
 julia:
   - 1.0
+  - 1.1
   - nightly
 matrix:
   allow_failures:
@@ -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())'
diff --git a/Project.toml b/Project.toml
new file mode 100644
index 0000000..90a2981
--- /dev/null
+++ b/Project.toml
@@ -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"]
diff --git a/REQUIRE b/REQUIRE
deleted file mode 100644
index d5a55b7..0000000
--- a/REQUIRE
+++ /dev/null
@@ -1,2 +0,0 @@
-julia 0.7-beta
-Primes
diff --git a/docs/Project.toml b/docs/Project.toml
new file mode 100644
index 0000000..aa96972
--- /dev/null
+++ b/docs/Project.toml
@@ -0,0 +1,3 @@
+[deps]
+DistributedArrays = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94"
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
diff --git a/docs/make.jl b/docs/make.jl
index 865d223..77cd0f7 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -2,7 +2,7 @@ using Documenter, DistributedArrays
 
 makedocs(
     modules = [DistributedArrays],
-    format = :html,
+    format = Documenter.HTML(),
     sitename = "DistributedArrays.jl",
     pages = [
         "Introduction" => "index.md"
@@ -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
 )
diff --git a/src/broadcast.jl b/src/broadcast.jl
index 57c37fc..cdd4a14 100644
--- a/src/broadcast.jl
+++ b/src/broadcast.jl
@@ -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