Merge 84ae1f0 into 5711c33

jbn · Aug 17, 2016 · a830c4e · a830c4e
2 parents 5711c33 + 84ae1f0
commit a830c4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,13 @@ os:
 julia:
     - 0.3
     - 0.4
+    - 0.5
     - nightly
 notifications:
   email: false
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-script:
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("RouletteWheels")'
-  - julia -e 'Pkg.test("RouletteWheels"; coverage=true)'
+#script: # use default script setting which is equivalent to the following
+#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#  - julia -e 'Pkg.clone(pwd()); Pkg.build("RouletteWheels")'
+#  - julia -e 'Pkg.test("RouletteWheels"; coverage=true)'
 after_success:
-  - julia -e 'cd(Pkg.dir("RouletteWheels")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia -e 'cd(Pkg.dir("RouletteWheels")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
diff --git a/src/RouletteWheels.jl b/src/RouletteWheels.jl
@@ -16,6 +16,8 @@ import Base.start
 
 if isdefined(Base, :normalize!)  # For 0.5.X
     import Base.normalize!
+elseif isdefined(Compat, :normalize!)
+    import Compat.normalize!
 end
 
 export RouletteWheel, LinearWalk, BisectingSearch, StochasticAcceptance