Depend and use HTTP instead of Requests and drop 0.4

.travis.yml

@@ -1,6 +1,5 @@
 language: julia
 julia:
-  - 0.4
   - 0.5
   - nightly
 notifications:

REQUIRE

@@ -1,5 +1,5 @@
-julia 0.4
+julia 0.5
 JSON
-Requests
+HTTP
 Git
 Compat 0.9.5

src/codecovio.jl

@@ -8,10 +8,7 @@ web service. It exports the `submit` and `submit_token` methods.
 """
 
 module Codecov
-    using Requests
-    using Coverage
-    using JSON
-    using Compat
+    using Coverage, HTTP, JSON
 
     export submit, submit_token, submit_local, submit_generic
 
@@ -154,9 +151,9 @@ module Codecov
         if !dry_run
             heads   = Dict("Content-Type" => "application/json")
             data    = to_json(fcs)
-            req     = Requests.post(URI(uri_str); json = data, headers = heads)
+            req     =  HTTP.post(uri_str; body = data, headers = heads)
             println("Result of submission:")
-            println(Compat.UTF8String(req.data))
+            println(String(req.data))
         end
     end
 

src/coveralls.jl

@@ -7,10 +7,7 @@ This module provides functionality to push coverage information to the Coveralls
 web service. It exports the `submit` and `submit_token` methods.
 """
 module Coveralls
-    using Coverage
-    using Requests
-    using JSON
-    using Compat
+    using Coverage, HTTP, JSON
 
     export submit, submit_token
 
@@ -54,11 +51,11 @@ module Coveralls
                     "service_name"      => "travis-ci",
                     "source_files"      => map(to_json, fcs))
         println("Submitting data to Coveralls...")
-        req = Requests.post(
-                URI("https://coveralls.io/api/v1/jobs"),
+        req = HTTP.post(
+                "https://coveralls.io/api/v1/jobs",
                 files = [FileParam(JSON.json(data),"application/json","json_file","coverage.json")])
         println("Result of submission:")
-        println(Compat.UTF8String(req.data))
+        println(String(req.data))
     end
 
     # query_git_info
@@ -118,9 +115,9 @@ module Coveralls
             end
         end
 
-        r = post(URI("https://coveralls.io/api/v1/jobs"), files =
-            [FileParam(JSON.json(data),"application/json","json_file","coverage.json")])
+        r = HTTP.post("https://coveralls.io/api/v1/jobs",
+            files = [FileParam(JSON.json(data),"application/json","json_file","coverage.json")])
         println("Result of submission:")
-        println(Compat.UTF8String(r.data))
+        println(String(r.data))
     end
 end  # module Coveralls

src/memalloc.jl

@@ -2,7 +2,7 @@
 
 immutable MallocInfo
     bytes::Int
-    filename::Compat.UTF8String
+    filename::String
     linenumber::Int
 end
 
@@ -32,7 +32,7 @@ function analyze_malloc_files(files)
 end
 
 function find_malloc_files(dirs)
-    files = Compat.String[]
+    files = String[]
     for dir in dirs
         filelist = readdir(dir)
         for file in filelist
@@ -46,10 +46,10 @@ function find_malloc_files(dirs)
     end
     files
 end
-find_malloc_files(file::Compat.String) = find_malloc_files([file])
+find_malloc_files(file::String) = find_malloc_files([file])
 
 analyze_malloc(dirs) = analyze_malloc_files(find_malloc_files(dirs))
-analyze_malloc(dir::Compat.String) = analyze_malloc([dir])
+analyze_malloc(dir::String) = analyze_malloc([dir])
 
 isfuncexpr(ex::Expr) =
     ex.head == :function || (ex.head == :(=) && typeof(ex.args[1]) == Expr && ex.args[1].head == :call)

test/runtests.jl

@@ -5,11 +5,11 @@
 #######################################################################
 
 using Coverage, Base.Test, Compat
-using Compat.String
 
 # test our filename matching. These aren't exported functions but it's probably
 # a good idea to have explicit tests for them, as they're used to match files
 # that get deleted
+@testset "Coverage" begin
 
 @test Coverage.iscovfile("test.jl.cov")
 @test Coverage.iscovfile("test.jl.2934.cov")
@@ -38,12 +38,12 @@ cd(dirname(@__DIR__)) do
     end
 
     # Test a file from scratch
-    srcname = joinpath("test", "data","testparser.jl")
+    srcname = joinpath(dirname(@__DIR__), "test", "data", "testparser.jl")
     covname = srcname*".cov"
     # clean out any previous coverage files. Don't use clean_folder because we
     # need to preserve the pre-baked coverage file Coverage.jl.cov
     clean_file(srcname)
-    cmdstr = "include(\"$srcname\"); using Base.Test; @test f2(2) == 4"
+    cmdstr = "include(\"$(escape_string(srcname))\"); using Base.Test; @test f2(2) == 4"
     run(`$JULIA_HOME/julia --code-coverage=user -e $cmdstr`)
     r = process_file(srcname, datadir)
     # The next one is the correct one, but julia & JuliaParser don't insert a line number after the 1-line @doc -> test
@@ -248,3 +248,5 @@ withenv(
     end
 
 end
+
+    end # testset