Skip to content

Commit ee0f709

Browse files
author
Pietro Vertechi
authored
update for julia1 (#28)
1 parent c07d7aa commit ee0f709

File tree

14 files changed

+55
-54
lines changed

14 files changed

+55
-54
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: julia
33
os:
44
- linux
55
julia:
6-
- 0.6
6+
- 1.0
77
- nightly
88
matrix:
99
allow_failures:
@@ -31,9 +31,9 @@ notifications:
3131
# - julia -e 'Pkg.clone(pwd()); Pkg.build("JuliaDBMeta"); Pkg.test("JuliaDBMeta"; coverage=true)'
3232
after_success:
3333
# push coverage results to Coveralls
34-
- julia -e 'cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
34+
- julia -e 'import Pkg; cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
3535
# push coverage results to Codecov
36-
- julia -e 'cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
36+
- julia -e 'import Pkg; cd(Pkg.dir("JuliaDBMeta")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
3737
# deploy docs
38-
- julia -e 'Pkg.add("Documenter")'
39-
- julia -e 'cd(Pkg.dir("JuliaDBMeta")); include(joinpath("docs", "make.jl"))'
38+
- julia -e 'import Pkg; Pkg.add("Documenter")'
39+
- julia -e 'import Pkg; cd(Pkg.dir("JuliaDBMeta")); include(joinpath("docs", "make.jl"))'

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
[![Build Status](https://travis-ci.org/piever/JuliaDBMeta.jl.svg?branch=master)](https://travis-ci.org/piever/JuliaDBMeta.jl)
44
[![codecov.io](http://codecov.io/github/piever/JuliaDBMeta.jl/coverage.svg?branch=master)](http://codecov.io/github/piever/JuliaDBMeta.jl?branch=master)
55
[![](https://img.shields.io/badge/docs-latest-blue.svg)](https://piever.github.io/JuliaDBMeta.jl/latest/)
6-
[![JuliaDBMeta](http://pkg.julialang.org/badges/JuliaDBMeta_0.6.svg)](http://pkg.julialang.org/?pkg=JuliaDBMeta)
7-
[![JuliaDBMeta](http://pkg.julialang.org/badges/JuliaDBMeta_0.7.svg)](http://pkg.julialang.org/?pkg=JuliaDBMeta)
86

97
JuliaDBMeta is a set of macros to simplify data manipulation with [JuliaDB](https://github.com/JuliaComputing/JuliaDB.jl), heavily inspired on [DataFramesMeta](https://github.com/JuliaStats/DataFramesMeta.jl). It exploits the technical advantages of JuliaDB:
108

REQUIRE

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
julia 0.6
2-
Compat
3-
IndexedTables 0.7.2
4-
JuliaDB 0.7.0
1+
julia 1.0.2
2+
IndexedTables 0.8.1
3+
JuliaDB 0.9.0
54
Reexport
65
MacroTools
76
IterTools

src/JuliaDBMeta.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
__precompile__()
21
module JuliaDBMeta
32

4-
using IndexedTables, MacroTools, NamedTuples, Reexport
3+
using IndexedTables, MacroTools, Reexport
4+
import IndexedTables: select
55
import IterTools
66

77
import JuliaDB: Dataset, DDataset, fromchunks

src/apply.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function thread(ex)
7676
if isexpr(ex, :block)
7777
thread(rmlines(ex).args...)
7878
elseif isa(ex, Expr)
79-
us = find(ex.args .== :(_))
79+
us = findall(ex.args .== :(_))
8080
i = gensym()
8181
ex.args[us] .= i
8282
isempty(us) ? ex : Expr(:(->), i, ex)

src/byrow.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ the scope where the macro is called.
99
## Examples
1010
1111
```jldoctest byrow
12-
julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
12+
julia> t = table((a = [1,2,3], b = ["x","y","z"]));
1313
1414
julia> @byrow! t :b = :b*string(:a)
1515
Table with 3 rows, 2 columns:

src/filter.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ the scope where the macro is called.
1010
## Examples
1111
1212
```jldoctest filter
13-
julia> t = table(@NT(a = [1,2,3], b=[2,3,4]));
13+
julia> t = table((a = [1,2,3], b=[2,3,4]));
1414
1515
julia> @filter t :a < 3
1616
Table with 2 rows, 2 columns:

src/map.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ the scope where the macro is called.
1111
## Examples
1212
1313
```jldoctest map
14-
julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
14+
julia> t = table((a = [1,2,3], b = ["x","y","z"]));
1515
1616
julia> @map t :b*string(:a)
1717
3-element Array{String,1}:

src/pair.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ the scope where the macro is called.
99
## Examples
1010
1111
```jldoctest pair
12-
julia> t = table(@NT(a = [1,2,3], b = [4,5,6]));
12+
julia> t = table((a = [1,2,3], b = [4,5,6]));
1313
1414
julia> select(t, @=>(:a, :a + :b))
1515
Table with 3 rows, 2 columns:
@@ -44,7 +44,7 @@ Short-hand for `select(d, @=>(x))`
4444
## Examples
4545
4646
```jldoctest select
47-
julia> t = table(@NT(a = [1,2,3], b = [4,5,6]));
47+
julia> t = table((a = [1,2,3], b = [4,5,6]));
4848
4949
julia> @select(t, (:a, :a + :b))
5050
Table with 3 rows, 2 columns:

src/transform.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@deprecate transformcol setcol
22

3-
function _setcol(t, col::NamedTuples.NamedTuple)
3+
function _setcol(t, col::NamedTuple)
44
p = ((key => val) for (key, val) in zip(keys(col), values(col)))
55
setcol(t, p)
66
end
@@ -26,7 +26,7 @@ the scope where the macro is called.
2626
## Examples
2727
2828
```jldoctest transform_vec
29-
julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
29+
julia> t = table((a = [1,2,3], b = ["x","y","z"]));
3030
3131
julia> @transform_vec t {:a .+ 1}
3232
Table with 3 rows, 3 columns:
@@ -61,7 +61,7 @@ the scope where the macro is called.
6161
## Examples
6262
6363
```jldoctest transform
64-
julia> t = table(@NT(a = [1,2,3], b = ["x","y","z"]));
64+
julia> t = table((a = [1,2,3], b = ["x","y","z"]));
6565
6666
julia> @transform t {:a + 1}
6767
Table with 3 rows, 3 columns:

0 commit comments

Comments
 (0)