Merge pull request #8 from invenia/pointsix

Support 0.6

.travis.yml

@@ -4,7 +4,8 @@ os:
   - linux
   - osx
 julia:
-  - release
+  - 0.5
+  - 0.6
   - nightly
 matrix:
   allow_failures:

REQUIRE

@@ -1,5 +1,5 @@
-julia 0.5
-LightGraphs 0.7.0 0.8.0
+julia 0.5 0.7-
+LightGraphs 0.7.0
 Iterators 0.2.0
 DeferredFutures 0.3.0
 DataStructures 0.5.0

src/executors.jl

@@ -1,5 +1,13 @@
 import Iterators: chain
 
+if VERSION >= v"0.6.0-dev.2830"
+    import Base.Distributed: wrap_on_error, wrap_retry
+elseif VERSION >= v"0.6.0-dev.2603"
+    import Base.Parallel: wrap_on_error, wrap_retry
+else
+    import Base: wrap_on_error, wrap_retry
+end
+
 """
 An `Executor` handles execution of [`DispatchContext`](@ref)s.
 
@@ -373,12 +381,16 @@ function dispatch!(exec::Executor, ctx::DispatchContext; throw_error=true)
     for more details.
     ```
     =#
-    f = Base.wrap_on_error(
-        Base.wrap_retry(
+    retry_args = @static if VERSION < v"0.6.0-dev.2042"
+        (allow_retry(retry_on(exec)), retries(exec), Base.DEFAULT_RETRY_MAX_DELAY)
+    else
+        (ExponentialBackOff(; n=retries(exec)), allow_retry(retry_on(exec)))
+    end
+
+    f = wrap_on_error(
+        wrap_retry(
             run_inner!,
-            allow_retry(retry_on(exec)),
-            retries(exec),
-            Base.DEFAULT_RETRY_MAX_DELAY
+            retry_args...,
         ),
         on_error_inner!
     )
@@ -519,5 +531,9 @@ function allow_retry(conditions::Vector{Function})
         return ret
     end
 
-    return inner_allow_retry
+    @static if VERSION < v"0.6.0-dev.2042"
+        return inner_allow_retry
+    else
+        return (state, e) -> (state, inner_allow_retry(e))
+    end
 end

src/macros.jl

@@ -129,7 +129,7 @@ function process_nodes!(ex::Expr, ctx_sym::Symbol)
     elseif ex.head === :dispatchinclude
         process_include!(ex, ctx_sym)
     else
-        map!(x->process_nodes!(x, ctx_sym), ex.args)
+        map!(x->process_nodes!(x, ctx_sym), ex.args, ex.args)
     end
 
     return ex
@@ -147,7 +147,7 @@ function process_op!(ex::Expr, ctx_sym::Symbol)
         Expr(
             :call,
             Dispatcher.Op,
-            map!(x->process_nodes!(x, ctx_sym), fn_call_expr.args)...
+            map!(x->process_nodes!(x, ctx_sym), fn_call_expr.args, fn_call_expr.args)...
         )
     ]
 end
@@ -167,7 +167,7 @@ function process_include!(ex::Expr, ctx_sym::Symbol)
     insert!(fn_call_expr.args, 2, ctx_sym)
 
     ex.head = fn_call_expr.head
-    ex.args = map!(x->process_nodes!(x, ctx_sym), fn_call_expr.args)
+    ex.args = map!(x->process_nodes!(x, ctx_sym), fn_call_expr.args, fn_call_expr.args)
 
     ex
 end

src/nodes.jl

@@ -35,7 +35,7 @@ the [`dependencies`](@ref) function.
 """
 abstract DispatchNode <: DeferredFutures.AbstractRemoteRef
 
-typealias DispatchResult Result{DispatchNode, DependencyError}
+const DispatchResult = Result{DispatchNode, DependencyError}
 
 """
     has_label(node::DispatchNode) -> Bool