Skip to content

Commit

Permalink
update to julia-0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
alyst committed Aug 10, 2018
1 parent 482317f commit c6e8a28
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ language: julia
os:
- linux
julia:
- 0.6
- 0.7
- 1.0
- nightly
matrix:
allow_failures:
Expand Down
6 changes: 3 additions & 3 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
julia 0.6
julia 0.7
Reexport
DataFrames 0.11.4 1.0.0
DataFrames 0.13
RData 0.3
CodecZlib 0.4
CSV 0.2.3
FileIO 0.5
FileIO 1.0.0
5 changes: 2 additions & 3 deletions src/RDatasets.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
__precompile__()

module RDatasets
using Reexport, FileIO, CSV, CodecZlib
using Reexport, FileIO, RData, CSV, CodecZlib
using Printf: @sprintf
@reexport using DataFrames

export dataset
Expand Down
2 changes: 1 addition & 1 deletion src/datasets.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function datasets(package_name::AbstractString)
d = datasets()
d[d[:Package] .== package_name, :]
d[findfirst(isequal(package_name), d[:Package]), :]
end

function datasets()
Expand Down
2 changes: 1 addition & 1 deletion test/dataset.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@testset "Datasets validity" begin
goodname(sym) = ismatch(r"^[A-Za-z0-9_][A-Za-z0-9_.]*$", string(sym))
goodname(sym) = occursin(r"^[A-Za-z0-9_][A-Za-z0-9_.]*$", string(sym))

allsets = RDatasets.datasets()
for pkgsets in groupby(allsets, :Package)
Expand Down
2 changes: 1 addition & 1 deletion test/datasets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
dfs_found = vcat(map(readdir(package_directory)) do directory
fns = readdir(joinpath(package_directory, directory))
pkgs = fill(directory, length(fns))
sets = replace.(fns, r"(\.(rda|csv|gz))+$", "")
sets = replace.(fns, Ref(r"(\.(rda|csv|gz))+$" => ""))
DataFrame(Package = pkgs, Dataset = sets)
end...)

Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
#

using RDatasets
using Base.Test
using Test

my_tests = ["packages.jl",
"datasets.jl",
"dataset.jl"]

@testset "$my_test" for my_test in my_tests
info("Running $(my_test)...")
@info "Running $(my_test)..."
include(my_test)
end

0 comments on commit c6e8a28

Please sign in to comment.