From 01085abc1b7919797a2af63d073a458b7e232b88 Mon Sep 17 00:00:00 2001 From: Luis Benet Date: Wed, 5 Sep 2018 14:55:02 -0500 Subject: [PATCH] Support for Julia 0.7 and Julia 1.0 (#179) * Compatibility with Julia 1.0; fix versions in REQUIRE files Docs will be built using Julia 1.0 * Delete upper bound for Julia version in REQUIRE * Remove Julia 1.0 from the allowed failures in travis * Add "Build status" (travis) badge to README.md --- .travis.yml | 1 - README.md | 2 ++ REQUIRE | 2 +- docs/REQUIRE | 2 +- docs/make.jl | 2 +- src/TaylorSeries.jl | 7 ++++++- test/REQUIRE | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72b8c516..f91e8c05 100644 --- 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 index c77416c7..0c5f809a 100644 --- 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 index 9f45cdd5..aef1ca2b 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1 +1 @@ -julia 0.7.0 1.0 +julia 0.7.0 diff --git a/docs/REQUIRE b/docs/REQUIRE index f965d2dc..b718c916 100644 --- 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 index 7e2805fa..4d2d9231 100644 --- 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 index ef8bfc06..4e277755 100644 --- 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 index dc3a2219..1e28a141 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -1 +1 @@ -IntervalArithmetic 0.14.0 +IntervalArithmetic 0.15.0