Update Travis with JuMP release

jump-dev · Aug 27, 2019 · 70d5aec · 70d5aec
1 parent fe809a7
commit 70d5aec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,5 @@ julia:
   - 1.0
   - 1.1
   - 1.2
-before_script:
-  - julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuMP", rev="master"))'
 notifications:
   email: false
diff --git a/src/attributes.jl b/src/attributes.jl
@@ -36,3 +36,10 @@ MomentsAttribute() = MomentsAttribute(1)
 function MOI.is_set_by_optimize(::MomentsAttribute)
     return true
 end
+
+# This is type piracy but we tolerate it.
+const ObjectWithoutIndex = Union{AbstractMonomial, AbstractTerm{<:MOI.Utilities.ObjectWithoutIndex}, AbstractPolynomial{<:MOI.Utilities.ObjectWithoutIndex}}
+const ObjectOrTupleWithoutIndex = Union{ObjectWithoutIndex, Tuple{Vararg{ObjectWithoutIndex}}}
+const ObjectOrTupleOrArrayWithoutIndex = Union{ObjectOrTupleWithoutIndex, AbstractArray{<:ObjectOrTupleWithoutIndex}}
+MOI.Utilities.map_indices(::Function, x::ObjectOrTupleOrArrayWithoutIndex) = x
+MOI.Utilities.substitute_variables(::Function, x::ObjectOrTupleOrArrayWithoutIndex) = x