Merge remote-tracking branch 'origin/master'

SciML · May 12, 2017 · 7edbbcf · 7edbbcf
2 parents 2a415ad + c092dfe
commit 7edbbcf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,12 @@ os:
   - linux
   - osx
 julia:
-  - release
+  - 0.5
+  - 0.6
   - nightly
 matrix:
   allow_failures:
+    - julia: 0.6
     - julia: nightly
 notifications:
   email: false

diff --git a/README.md b/README.md
@@ -6,7 +6,10 @@
 [![Coverage Status](https://coveralls.io/repos/JuliaDiffEq/DelayDiffEq.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaDiffEq/DelayDiffEq.jl?branch=master)
 [![codecov.io](http://codecov.io/github/JuliaDiffEq/DelayDiffEq.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaDiffEq/DelayDiffEq.jl?branch=master)
 
-OrdinaryDiffEq.jl is a component package in the DifferentialEquations ecosystem. It holds the
+[![DelayDiffEq](http://pkg.julialang.org/badges/DelayDiffEq_0.5.svg)](http://pkg.julialang.org/?pkg=DelayDiffEq)
+[![DelayDiffEq](http://pkg.julialang.org/badges/DelayDiffEq_0.6.svg)](http://pkg.julialang.org/?pkg=DelayDiffEq)
+
+DelayDiffEq.jl is a component package in the DifferentialEquations ecosystem. It holds the
 delay differential equation solvers and utilities. It is built on top of OrdinaryDiffEq
 to extend those solvers for differential delay equations. While completely independent
 and usable on its own, users interested in using this

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,10 +2,14 @@ environment:
   matrix:
     - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
     - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+    - JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+    - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 matrix:
   allow_failures:
+    - JULIAVERSION: "julialang/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+    - JULIAVERSION: "julialang/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 branches: