From 156d38aa01d53ddaaf10fb4a10e405cb83d57890 Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Sat, 19 Sep 2015 19:04:46 -0400
Subject: [PATCH 1/2] Fix 0.4 deprecated bindings

---
 src/derivative.jl    | 12 ++++++------
 src/differentiate.jl |  6 +++---
 src/symbolic.jl      |  5 ++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/derivative.jl b/src/derivative.jl
index fe784cf..414b0d3 100644
--- a/src/derivative.jl
+++ b/src/derivative.jl
@@ -8,10 +8,10 @@ function derivative(f::Function, ftype::Symbol, dtype::Symbol)
   end
   return g
 end
-derivative{T <: Number}(f::Function, x::Union(T, Vector{T}), dtype::Symbol = :central) = finite_difference(f, float(x), dtype)
+Compat.@compat derivative{T <: Number}(f::Function, x::Union{T, Vector{T}}, dtype::Symbol = :central) = finite_difference(f, float(x), dtype)
 derivative(f::Function, dtype::Symbol = :central) = derivative(f, :scalar, dtype)
 
-gradient{T <: Number}(f::Function, x::Union(T, Vector{T}), dtype::Symbol = :central) = finite_difference(f, float(x), dtype)
+Compat.@compat gradient{T <: Number}(f::Function, x::Union{T, Vector{T}}, dtype::Symbol = :central) = finite_difference(f, float(x), dtype)
 gradient(f::Function, dtype::Symbol = :central) = derivative(f, :vector, dtype)
 
 ctranspose(f::Function) = derivative(f)
@@ -35,16 +35,16 @@ function second_derivative(f::Function, g::Function, ftype::Symbol, dtype::Symbo
   end
   return h
 end
-function second_derivative{T <: Number}(f::Function, g::Function, x::Union(T, Vector{T}), dtype::Symbol)
+Compat.@compat function second_derivative{T <: Number}(f::Function, g::Function, x::Union{T, Vector{T}}, dtype::Symbol)
   finite_difference_hessian(f, g, x, dtype)
 end
-function hessian{T <: Number}(f::Function, g::Function, x::Union(T, Vector{T}), dtype::Symbol)
+Compat.@compat function hessian{T <: Number}(f::Function, g::Function, x::Union{T, Vector{T}}, dtype::Symbol)
   finite_difference_hessian(f, g, x, dtype)
 end
-function second_derivative{T <: Number}(f::Function, g::Function, x::Union(T, Vector{T}))
+Compat.@compat function second_derivative{T <: Number}(f::Function, g::Function, x::Union{T, Vector{T}})
   finite_difference_hessian(f, g, x, :central)
 end
-function hessian{T <: Number}(f::Function, g::Function, x::Union(T, Vector{T}))
+Compat.@compat function hessian{T <: Number}(f::Function, g::Function, x::Union{T, Vector{T}})
   finite_difference_hessian(f, g, x, :central)
 end
 function second_derivative(f::Function, x::Number, dtype::Symbol)
diff --git a/src/differentiate.jl b/src/differentiate.jl
index d1eb300..72192e1 100644
--- a/src/differentiate.jl
+++ b/src/differentiate.jl
@@ -270,6 +270,6 @@ function differentiate(ex::Expr, targets::Vector{Symbol})
 end
 
 differentiate(ex::Expr) = differentiate(ex, :x)
-differentiate(s::String, target...) = differentiate(parse(s), target...)
-differentiate(s::String, target::String) = differentiate(parse(s), symbol(target))
-differentiate{T <: String}(s::String, targets::Vector{T}) = differentiate(parse(s), map(symbol, targets))
+differentiate(s::Compat.AbstractString, target...) = differentiate(parse(s), target...)
+differentiate(s::Compat.AbstractString, target::Compat.AbstractString) = differentiate(parse(s), symbol(target))
+differentiate{T <: Compat.AbstractString}(s::Compat.AbstractString, targets::Vector{T}) = differentiate(parse(s), map(symbol, targets))
diff --git a/src/symbolic.jl b/src/symbolic.jl
index 55c8e3f..48be3d5 100644
--- a/src/symbolic.jl
+++ b/src/symbolic.jl
@@ -1,6 +1,5 @@
-
 export Symbolic, AbstractVariable, SymbolicVariable, BasicVariable, processExpr, @sexpr
-export SymbolParameter, simplify 
+export SymbolParameter, simplify
 import Base.show, Base.(==)
 
 #################################################################
@@ -15,7 +14,7 @@ import Base.show, Base.(==)
 
 abstract Symbolic
 abstract AbstractVariable <: Symbolic
-typealias SymbolicVariable Union(Symbol, AbstractVariable)
+Compat.@compat typealias SymbolicVariable Union{Symbol, AbstractVariable}
 
 
 #################################################################

From fbb7d9c723d5aad2a84b3b091c76f76076f51b92 Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Sat, 19 Sep 2015 19:05:11 -0400
Subject: [PATCH 2/2] Upgrade travis settings

---
 .travis.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bef6cf7..e0ea53d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,10 @@
-language: cpp 
-compiler:
-  - clang
+language: julia
+os:
+    - linux
+    - osx
+julia:
+    - 0.3
+    - 0.4
+    - nightly
 notifications:
   email: false
-env:
-  matrix:
-    - JULIAVERSION="juliareleases"
-    - JULIAVERSION="julianightlies"
-before_install:
-  - sudo add-apt-repository ppa:staticfloat/julia-deps -y
-  - sudo add-apt-repository ppa:staticfloat/${JULIAVERSION} -y
-  - sudo apt-get update -qq -y
-  - sudo apt-get install libpcre3-dev julia -y
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-script:
-  - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.test("Calculus")'