From 96d9175702dcecbed2ec7d836156a542dbcd8b20 Mon Sep 17 00:00:00 2001 From: Spencer Russell Date: Sat, 28 Jun 2014 14:04:37 -0500 Subject: [PATCH 1/3] Names the actual script that gets run by Pkg.build --- doc/stdlib/pkg.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdlib/pkg.rst b/doc/stdlib/pkg.rst index 57c5f2a3601ee..ab63438e26a4a 100644 --- a/doc/stdlib/pkg.rst +++ b/doc/stdlib/pkg.rst @@ -103,11 +103,11 @@ to use them, you'll need to prefix each function call with an explicit ``Pkg.``, .. function:: build() - Run the build scripts for all installed packages in depth-first recursive order. + Run the build script for all installed packages in depth-first recursive order. .. function:: build(pkgs...) - Run the build scripts for each package in ``pkgs`` and all of their dependencies in depth-first recursive order. + Run the build script in "deps/build.jl" for each package in ``pkgs`` and all of their dependencies in depth-first recursive order. This is called automatically by ``Pkg.resolve()`` on all installed or updated packages. .. function:: generate(pkg,license) From 4bf121762d172cc089a0412276571b6bb21cdd3d Mon Sep 17 00:00:00 2001 From: Spencer Russell Date: Sat, 28 Jun 2014 15:36:42 -0500 Subject: [PATCH 2/3] reverts mistaken grammatical change --- doc/stdlib/pkg.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdlib/pkg.rst b/doc/stdlib/pkg.rst index ab63438e26a4a..409bd90dc94a6 100644 --- a/doc/stdlib/pkg.rst +++ b/doc/stdlib/pkg.rst @@ -103,7 +103,7 @@ to use them, you'll need to prefix each function call with an explicit ``Pkg.``, .. function:: build() - Run the build script for all installed packages in depth-first recursive order. + Run the build scripts for all installed packages in depth-first recursive order. .. function:: build(pkgs...) From 06ce5df14bea415a5a016fc950b33a16d9b57b12 Mon Sep 17 00:00:00 2001 From: tan Date: Mon, 30 Jun 2014 17:33:25 +0530 Subject: [PATCH 3/3] readcsv can read true and false strings as Bool. fixes #7463 --- base/datafmt.jl | 1 + test/readdlm.jl | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/base/datafmt.jl b/base/datafmt.jl index 6bde165b3029f..d4518b720a1f7 100644 --- a/base/datafmt.jl +++ b/base/datafmt.jl @@ -319,6 +319,7 @@ function dlm_fill(T::DataType, offarr::Vector{Vector{Int}}, dims::NTuple{2,Integ end +colval{T<:Bool, S<:String}(sval::S, cells::Array{T,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = ((sval=="true") && (cells[row,col]=true; return false); (sval=="false") && (cells[row,col]=false; return false); true) colval{T<:Number, S<:String}(sval::S, cells::Array{T,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = (float64_isvalid(sval, tmp64) ? ((cells[row,col] = tmp64[1]); false) : true) colval{T<:String, S<:String}(sval::S, cells::Array{T,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = ((cells[row,col] = sval); false) colval{S<:String}(sval::S, cells::Array{Any,2}, row::Int, col::Int, tmp64::Array{Float64,1}) = ((cells[row,col] = float64_isvalid(sval, tmp64) ? tmp64[1] : sval); false) diff --git a/test/readdlm.jl b/test/readdlm.jl index b4a17ee149b67..1b87451cd4e6c 100644 --- a/test/readdlm.jl +++ b/test/readdlm.jl @@ -68,6 +68,12 @@ end @test isequaldlm(readcsv(IOBuffer("\n1,2,3\n4,5,6\n\n\n")), reshape({"",1.0,4.0,"","","",2.0,5.0,"","","",3.0,6.0,"",""}, 5, 3), Any) +let x = randbool(5, 10), io = IOBuffer() + writedlm(io, x) + seek(io, 0) + @test readdlm(io, Bool) == x +end + let x = [1,2,3], y = [4,5,6], io = IOBuffer() writedlm(io, zip(x,y), ", ") seek(io, 0)