drop support for Julia 0.5

jump-dev · Jun 10, 2017 · 4bfe73d · 4bfe73d
1 parent 382d16d
commit 4bfe73d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ os:
     - linux
     - osx
 julia:
-    - 0.5
     - 0.6
     - nightly
 notifications:

diff --git a/REQUIRE b/REQUIRE
@@ -1,6 +1,5 @@
-julia 0.5
+julia 0.6-rc
 MathProgBase 0.6 0.7
 ReverseDiffSparse 0.7 0.8
 ForwardDiff 0.3 0.5
 Calculus
-Compat 0.18
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,5 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"

diff --git a/src/JuMP.jl b/src/JuMP.jl
@@ -12,8 +12,6 @@ __precompile__()
 
 module JuMP
 
-using Compat
-
 importall Base.Operators
 import Base.map
 
@@ -61,7 +59,7 @@ include("utils.jl")
 ###############################################################################
 # Model class
 # Keeps track of all model and column info
-@compat abstract type AbstractModel end
+abstract type AbstractModel end
 type Model <: AbstractModel
     obj#::QuadExpr
     objSense::Symbol
@@ -323,10 +321,10 @@ setprinthook(m::Model, f) = (m.printhook = f)
 #############################################################################
 # AbstractConstraint
 # Abstract base type for all constraint types
-@compat abstract type AbstractConstraint end
+abstract type AbstractConstraint end
 # Abstract base type for all scalar types
 # In JuMP, used only for Variable. Useful primarily for extensions
-@compat abstract type AbstractJuMPScalar end
+abstract type AbstractJuMPScalar end
 
 Base.start(::AbstractJuMPScalar) = false
 Base.next(x::AbstractJuMPScalar, state) = (x, true)

diff --git a/src/JuMPContainer.jl b/src/JuMPContainer.jl
@@ -6,7 +6,7 @@
 using Base.Meta
 # multivarate "dictionary" used for collections of variables/constraints
 
-@compat abstract type JuMPContainer{T,N} end
+abstract type JuMPContainer{T,N} end
 
 include("JuMPArray.jl")
 

diff --git a/src/callbacks.jl b/src/callbacks.jl
@@ -5,7 +5,7 @@
 
 export addlazycallback, addcutcallback, addheuristiccallback, addinfocallback
 
-@compat abstract type JuMPCallback end
+abstract type JuMPCallback end
 type LazyCallback <: JuMPCallback
     f::Function
     fractional::Bool

diff --git a/src/norms.jl b/src/norms.jl
@@ -74,7 +74,7 @@ _build_norm{C,V}(P,terms::Vector{GenericAffExpr{C,V}}) = GenericNorm(P,terms)
 _build_norm(Lp, terms::Vector{GenericAffExpr}) = _build_norm(Lp, [terms...])
 
 # Alias for AffExprs. Short-hand used in operator overloads, etc.
-@compat Norm{P} = GenericNorm{P,Float64,Variable}
+Norm{P} = GenericNorm{P,Float64,Variable}
 
 getvalue{P,C,V}(n::GenericNorm{P,C,V}) = norm(getvalue(n.terms),P)
 
@@ -95,7 +95,7 @@ Base.convert{P,C,V}(::Type{GenericNormExpr{P,C,V}}, x::GenericNorm{P,C,V}) =
     GenericNormExpr{P,C,V}(x, one(C), zero(GenericAffExpr{C,V}))
 
 # Alias for ‖Ax‖₂ case
-@compat GenericSOCExpr{C,V} = GenericNormExpr{2,C,V}
+GenericSOCExpr{C,V} = GenericNormExpr{2,C,V}
 
 # Alias for ‖Ax‖₂ and AffExpr case
 const SOCExpr = GenericSOCExpr{Float64,Variable}

diff --git a/src/print.jl b/src/print.jl
@@ -23,9 +23,9 @@
 #############################################################################
 
 # Used for dispatching
-@compat abstract type PrintMode end
-@compat abstract type REPLMode <: PrintMode end
-@compat abstract type IJuliaMode <: PrintMode end
+abstract type PrintMode end
+abstract type REPLMode <: PrintMode end
+abstract type IJuliaMode <: PrintMode end
 
 # Whether something is zero or not for the purposes of printing it
 const PRINT_ZERO_TOL = 1e-10