Merge 701770f into 636666c

JuliaLang · Feb 15, 2018 · 59dcc05 · 59dcc05
2 parents 636666c + 701770f
commit 59dcc05
Show file tree

Hide file tree

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

diff --git a/REQUIRE b/REQUIRE
@@ -3,4 +3,4 @@
 # The format of the file is that ignore comments and blank lines, each line must have the form "pkg v1 v2..." where the zero or more version numbers in semantic version format [http://semver.org/] determine what intervals of versions of each package are required.
 # If no REQUIRE file is present, it means there are no requirements.
 # See README.md for more details.
-julia 0.4
+julia 0.6
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,5 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
-  - 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/Example.jl b/src/Example.jl
@@ -2,6 +2,6 @@ module Example
 export hello, domath
 
 hello(who::String) = "Hello, $who"
-domath(x::Number) = (x + 5)
+domath(x::Number) = x + 5
 
 end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,4 +2,4 @@ using Example
 using Base.Test
 
 @test hello("Julia") == "Hello, Julia"
-@test_approx_eq domath(2.0) 7.0
+@test domath(2.0) ≈ 7.0