Merge 2acd220 into 481570c

JuliaDiff · Sep 5, 2018 · 4734157 · 4734157
2 parents 481570c + 2acd220
commit 4734157
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ notifications:
 
 matrix:
   allow_failures:
-  - julia: 1.0
   - julia: nightly
 
 script:

diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@ independent variables.
 
 [![TaylorSeries](http://pkg.julialang.org/badges/TaylorSeries_0.6.svg)](http://pkg.julialang.org/?pkg=TaylorSeries)
 [![TaylorSeries](http://pkg.julialang.org/badges/TaylorSeries_0.7.svg)](http://pkg.julialang.org/?pkg=TaylorSeries)
+[![Build Status](https://api.travis-ci.org/JuliaDiff/TaylorSeries.jl.svg)](https://travis-ci.org/JuliaDiff/TaylorSeries.jl)
+
 [![Coverage Status](https://coveralls.io/repos/JuliaDiff/TaylorSeries.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaDiff/TaylorSeries.jl?branch=master)
 
 [![](https://img.shields.io/badge/docs-stable-blue.svg)](http://www.juliadiff.org/TaylorSeries.jl/stable)

diff --git a/REQUIRE b/REQUIRE
@@ -1 +1 @@
-julia 0.7.0 1.0
+julia 0.7.0
diff --git a/docs/REQUIRE b/docs/REQUIRE
@@ -1 +1 @@
-Documenter 0.19.5
+Documenter 0.19.6
diff --git a/docs/make.jl b/docs/make.jl
@@ -16,7 +16,7 @@ makedocs(
 deploydocs(
     repo   = "github.com/JuliaDiff/TaylorSeries.jl.git",
     target = "build",
-    julia = "0.7",
+    julia = "1.0",
     osname = "linux",
     deps   = nothing,
     make   = nothing

diff --git a/src/TaylorSeries.jl b/src/TaylorSeries.jl
@@ -19,8 +19,13 @@ module TaylorSeries
 
 using InteractiveUtils: subtypes
 using SparseArrays: SparseMatrixCSC
-import LinearAlgebra: norm, gradient, mul!
 using Markdown
+import LinearAlgebra: norm, mul!
+if VERSION ≥ v"1.0.0"
+    export gradient
+else
+    import LinearAlgebra: gradient
+end
 
 import Base: ==, +, -, *, /, ^
 

diff --git a/test/REQUIRE b/test/REQUIRE
@@ -1 +1 @@
-IntervalArithmetic 0.14.0
+IntervalArithmetic 0.15.0