Skip to content

Commit

Permalink
Merge pull request #121 from fredo-dedup/julia-0.7
Browse files Browse the repository at this point in the history
Julia 0.7
  • Loading branch information
davidanthoff authored Sep 4, 2018
2 parents ddc8837 + 1efb460 commit ed03ddf
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 22 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ os:
julia:
- 0.7
- 1.0
- nightly
notifications:
email: false
branches:
only:
- master
- /release-.*/
- /v(\d+)\.(\d+)\.(\d+)/
matrix:
allow_failures:
- julia: nightly
addons:
apt:
packages:
Expand All @@ -22,9 +26,9 @@ addons:
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
- $TESTCMD --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.build("VegaLite"); Pkg.test("VegaLite"; coverage=true)'
- $TESTCMD --check-bounds=yes -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("VegaLite"); Pkg.test("VegaLite"; coverage=true)'
after_success:
- julia -e 'cd(Pkg.dir("VegaLite")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'cd(Pkg.dir("VegaLite")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'Pkg.add("Documenter")'
- $TESTCMD -e 'cd(Pkg.dir("VegaLite")); include(joinpath("docs", "make.jl"))'
- julia -e 'cd(Pkg.dir("VegaLite")); include(joinpath("docs", "make.jl"))'
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# VegaLite.jl v0.4.0 Release Notes
* Drop julia 0.6 support, add julia 0.7 support

# VegaLite.jl v0.3.4 Release Notes
* Disable check against schema from julia for now

Expand Down
26 changes: 13 additions & 13 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
julia 0.7
JSON
Requires
NodeJS
Cairo
Rsvg
IteratorInterfaceExtensions 0.0.1
TableTraits 0.0.2
IterableTables
FileIO 0.9.1
DataValues
MacroTools
URIParser
FilePaths
JSON 0.19.0
Requires 0.5.2
NodeJS 0.5.1
Cairo 0.5.6
Rsvg 0.2.2
IteratorInterfaceExtensions 0.1.1
TableTraits 0.3.1
IterableTables 0.8.3
FileIO 1.0.1
DataValues 0.4.4
MacroTools 0.4.4
URIParser 0.4.0
FilePaths 0.7.0
11 changes: 5 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ environment:
matrix:
- julia_version: 0.7
- julia_version: 1.0
- julia_version: nightly

platform:
- x86 # 32-bit
# - x86 # 32-bit
- x64 # 64-bit

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
# matrix:
# allow_failures:
# - julia_version: latest
matrix:
allow_failures:
- julia_version: nightly

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ deploydocs(
make = nothing,
target = "build",
repo = "github.com/fredo-dedup/VegaLite.jl.git",
julia = "0.6"
julia = "1.0"
)

0 comments on commit ed03ddf

Please sign in to comment.