Julia 0.7/1.0

.travis.yml

@@ -4,7 +4,8 @@ os:
  - linux
  - osx
 julia:
- - 0.6
+ - 0.7
+ - 1.0
  - nightly
 notifications:
  email: false

REQUIRE

@@ -1,4 +1,5 @@
-julia 0.6
+julia 0.7
+Dates
 DataStructures
 TimeFrames
 TimeZones

docs/src/sample/sample.jl

@@ -1,5 +1,6 @@
 using ExtensibleScheduler
 using TimeFrames
+using Dates: now
 
 function print_time_noparam()
  println("From print_time_noparam $(now(Dates.UTC))")

src/ExtensibleScheduler.jl

@@ -15,6 +15,8 @@ module ExtensibleScheduler
  export SimClock, set, NoSleep
  export iterate
 
+ using Dates
+
  include("priority.jl")
  include("clock/base.jl")
  include("action.jl")

src/clock/rtclock.jl

@@ -1,4 +1,4 @@
-import Base: now
+import Dates: now
 
 
 """

src/clock/time.jl

@@ -40,8 +40,10 @@ FloatTimeFunc = FloatTimeFuncStruct()
 """
 Default time function
 """
+global _time = UTCDateTimeFunc
+
 # Time as Float64
 #_time = FloatTimeFunc
 
 # Time as DateTime (UTC)
-_time = UTCDateTimeFunc
+#_time = UTCDateTimeFunc

src/jobstores/base.jl

@@ -1,3 +1,6 @@
+using UUIDs
+
+
 """
 `AbstractJobStore` is an abstract type for jobstores
 
@@ -15,7 +18,7 @@ It's preferable to use `get_job_id(jobstore)` to ensure
 that a `job_id` is unique for a given `JobStore`.
 """
 function get_job_id()
- string(Base.Random.uuid4())
+ string(UUIDs.uuid4())
 end
 
 include("memory.jl")

src/jobstores/memory.jl

@@ -122,7 +122,7 @@ if it shouldn't be fired again.
 """
 function update(jobstore::MemoryJobStore, job::Job, now_)
  job.dt_updated = now_
- itr_size = iteratorsize(job.trigger)
+ itr_size = IteratorSize(job.trigger)
  if itr_size == HasLength()
  remaining = length(job.trigger) - job.n_triggered
  if remaining > 0

src/schedulers/base.jl

@@ -1,3 +1,6 @@
+using UUIDs
+
+
 """
 `AbstractScheduler` is an abstract type for schedulers.
 
@@ -19,5 +22,5 @@ include("blocking.jl")
 Return a random identifier for a scheduler.
 """
 function get_scheduler_id()
- string(Base.Random.uuid4())[1:13]
+ string(UUIDs.uuid4())[1:13]
 end

src/schedulers/blocking.jl

@@ -1,4 +1,5 @@
-import Base: sleep, now
+import Base: sleep
+using Dates: now
 
 
 """

src/triggers/base.jl

@@ -1,4 +1,4 @@
-import Base: iteratorsize, HasLength, IsInfinite, length
+import Base: IteratorSize, HasLength, IsInfinite, length
 
 
 """
@@ -21,11 +21,11 @@ struct NoTrigger <: AbstractTrigger
 end
 
 
-function iteratorsize(trigger::AbstractFiniteTrigger)
+function IteratorSize(trigger::AbstractFiniteTrigger)
  HasLength()
 end
 
-function iteratorsize(trigger::AbstractInfiniteTrigger)
+function IteratorSize(trigger::AbstractInfiniteTrigger)
  IsInfinite()
 end
 

src/triggers/instant.jl

@@ -1,4 +1,4 @@
-import Base: iteratorsize, HasLength, length
+import Base: IteratorSize, HasLength, length
 
 """
  InstantTrigger(dt::DateTime)
@@ -9,7 +9,7 @@ struct InstantTrigger <: AbstractTrigger
  dt_fire_at::DateTime
 end
 
-iteratorsize(trigger::InstantTrigger) = HasLength()
+IteratorSize(trigger::InstantTrigger) = HasLength()
 length(trigger::InstantTrigger) = 1
 
 

src/triggers/iterator.jl

@@ -1,4 +1,4 @@
-import Base: start, done, next
+import Base: iterate
 
 """
  iterate(trigger, dt[, n=number_of_times])
@@ -44,37 +44,38 @@ end
 
 function TriggerIterator(trigger::AbstractTrigger, dt, n)
  if n < 0
- if iteratorsize(trigger) == IsInfinite()
+ if IteratorSize(trigger) == IsInfinite()
  InfiniteTriggerIterator(trigger, dt)
  else
  FiniteTriggerIterator(trigger, dt, trigger.n)
  end
  else
- if iteratorsize(trigger) == IsInfinite()
+ if IteratorSize(trigger) == IsInfinite()
  FiniteTriggerIterator(trigger, dt, n)
  else
  FiniteTriggerIterator(trigger, dt, min(n, trigger.n))
  end
  end
 end
 
-start(itr::AbstractTriggerIterator) = (itr.dt, 0)
-
-done(itr::InfiniteTriggerIterator, state) = false
-function done(itr::FiniteTriggerIterator, state)
- dt_next, i = state
- i >= itr.n
+function iterate(itr::AbstractTriggerIterator, state=(itr.dt, 0))
+ dt_now, i = state
+ i >= itr.n && return nothing
+ dt_next = get_next_dt_fire(itr.trigger, DateTime(0), dt_now)
+ i += 1
+ state = dt_next, i
+ return (dt_next, state)
 end
 
-function next(itr::AbstractTriggerIterator, state)
+function iterate(itr::InfiniteTriggerIterator, state=(itr.dt, 0))
  dt_now, i = state
  dt_next = get_next_dt_fire(itr.trigger, DateTime(0), dt_now)
  i += 1
  state = dt_next, i
- dt_next, state
+ return (dt_next, state)
 end
 
-iteratorsize(itr::InfiniteTriggerIterator) = IsInfinite()
-iteratorsize(itr::FiniteTriggerIterator) = HasLength()
+IteratorSize(itr::InfiniteTriggerIterator) = IsInfinite()
+IteratorSize(itr::FiniteTriggerIterator) = HasLength()
 
 length(itr::FiniteTriggerIterator) = itr.n

src/triggers/period.jl

@@ -1,4 +1,4 @@
-import Base: iteratorsize, HasLength, IsInfinite, length
+import Base: IteratorSize, HasLength, IsInfinite, length
 
 
 struct FinitePeriodTrigger <: AbstractFiniteTrigger

src/triggers/time.jl

@@ -1,4 +1,4 @@
-import Base: iteratorsize, HasLength, IsInfinite, length
+import Base: IteratorSize, HasLength, IsInfinite, length
 
 
 struct FiniteTimeTrigger <: AbstractFiniteTrigger

src/triggers/timeframe.jl

@@ -1,4 +1,4 @@
-import Base: iteratorsize, IsInfinite, length
+import Base: IteratorSize, IsInfinite, length
 
 
 using TimeFrames

test/runtests.jl

@@ -1,5 +1,5 @@
 using ExtensibleScheduler
-using Base.Test
+using Test
 
 include("test_priority.jl")
 include("test_job.jl")

test/samples/test_sample_blocking_scheduler.jl

@@ -1,4 +1,4 @@
-using Base.Test
+using Test
 using ExtensibleScheduler
 
 using TimeFrames

test/test_action.jl

@@ -1,4 +1,4 @@
-using Base.Test
+using Test
 using ExtensibleScheduler
 
 @testset "Action" begin

test/test_clock.jl

@@ -1,4 +1,4 @@
-using Base.Test
+using Test
 using ExtensibleScheduler
 using ExtensibleScheduler: real_time_clock, ClockException
 

test/test_job.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates: now
 using ExtensibleScheduler
 using ExtensibleScheduler: Job, get_job_id, JobConfig
 

test/test_jobstores.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates: now
 using ExtensibleScheduler
 using ExtensibleScheduler: MemoryJobStore, Job, get_job_id
 

test/test_priority.jl

@@ -1,5 +1,6 @@
-using Base.Test
+using Test
 using ExtensibleScheduler: Priority
+using Dates
 
 @testset "Priority Tests" begin
 
@@ -32,4 +33,4 @@ using ExtensibleScheduler: Priority
  p2 = Priority(DateTime(2010, 1, 1), 0)
  @test p2 > p1
  end
-end
+end

test/trigger/test_trigger_custom.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 using TimeFrames
 

test/trigger/test_trigger_instant.jl

@@ -1,7 +1,8 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 using ExtensibleScheduler: InstantTrigger, get_next_dt_fire
-using Base: iteratorsize, HasLength, length
+using Base: IteratorSize, HasLength, length
 
 
 @testset "InstantTrigger" begin
@@ -14,7 +15,7 @@ using Base: iteratorsize, HasLength, length
  @test trigger isa InstantTrigger
  @test get_next_dt_fire(trigger, dt_previous_fire, dt_now) == dt_next_fire
 
- @test iteratorsize(trigger) == HasLength()
+ @test IteratorSize(trigger) == HasLength()
  @test length(trigger) == 1
  end
 

test/trigger/test_trigger_iterator.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 
 

test/trigger/test_trigger_offset.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 using ExtensibleScheduler: TriggerOffset, get_next_dt_fire
 

test/trigger/test_trigger_period.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 
 @testset "PeriodTrigger" begin

test/trigger/test_trigger_time.jl

@@ -1,7 +1,8 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 using ExtensibleScheduler: FiniteTimeTrigger, InfiniteTimeTrigger, get_next_dt_fire
-using Base: iteratorsize, HasLength, IsInfinite, length
+using Base: IteratorSize, HasLength, IsInfinite, length
 
 
 @testset "TimeTrigger" begin
@@ -16,7 +17,7 @@ using Base: iteratorsize, HasLength, IsInfinite, length
  @test trigger isa FiniteTimeTrigger
  @test get_next_dt_fire(trigger, dt_previous_fire, dt_now) == dt_next_fire
 
- @test iteratorsize(trigger) == HasLength()
+ @test IteratorSize(trigger) == HasLength()
  @test length(trigger) == 1
  end
  end
@@ -82,7 +83,7 @@ using Base: iteratorsize, HasLength, IsInfinite, length
  @test trigger isa FiniteTimeTrigger
  @test get_next_dt_fire(trigger, dt_previous_fire, dt_now) == dt_next_fire
 
- @test iteratorsize(trigger) == HasLength()
+ @test IteratorSize(trigger) == HasLength()
  @test length(trigger) == n
  end
 
@@ -145,7 +146,7 @@ using Base: iteratorsize, HasLength, IsInfinite, length
  @test trigger isa InfiniteTimeTrigger
  @test get_next_dt_fire(trigger, dt_previous_fire, dt_now) == dt_next_fire
 
- @test iteratorsize(trigger) == IsInfinite()
+ @test IteratorSize(trigger) == IsInfinite()
  @test_throws MethodError length(trigger)
  end
  @testset "sample" begin

test/trigger/test_trigger_timeframe.jl

@@ -1,4 +1,5 @@
-using Base.Test
+using Test
+using Dates
 using ExtensibleScheduler
 using TimeFrames
 

test/trigger/test_triggers.jl

@@ -1,7 +1,7 @@
-using Base.Test
+using Test
 using ExtensibleScheduler
 using ExtensibleScheduler: InstantTrigger, TimeTrigger, get_next_dt_fire
-using Base: iteratorsize, HasLength, IsInfinite, length
+using Base: IteratorSize, HasLength, IsInfinite, length
 using ExtensibleScheduler: TriggerOffset
 using ExtensibleScheduler: iterate