From 6f32f82d1f8b172c74c71750266a15e779047d5b Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Wed, 29 Aug 2018 22:08:42 -0700 Subject: [PATCH 1/9] Build docs on 1.0 --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index 1a6bcb77..d4d8eacc 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -51,5 +51,5 @@ deploydocs( make = nothing, target = "build", repo = "github.com/fredo-dedup/VegaLite.jl.git", - julia = "0.6" + julia = "1.0" ) From a713d541460bf09278167ca7bee00fc9c4bb14a3 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Wed, 29 Aug 2018 22:08:48 -0700 Subject: [PATCH 2/9] Update REQUIRE --- REQUIRE | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/REQUIRE b/REQUIRE index caa58d53..0f448557 100644 --- a/REQUIRE +++ b/REQUIRE @@ -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.5 +Rsvg 0.2.2 +IteratorInterfaceExtensions 0.1.1 +TableTraits 0.3.1 +IterableTables 0.8.3 +FileIO 1.0.0 +DataValues 0.4.4 +MacroTools 0.4.4 +URIParser 0.4.0 +FilePaths 0.7.0 From e75bb24a5b7a816a9f77a5296a4f721403bcf09d Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Thu, 30 Aug 2018 23:04:09 -0700 Subject: [PATCH 3/9] Fix ci config --- .travis.yml | 4 ++++ appveyor.yml | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76148f87..c285b8f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ os: julia: - 0.7 - 1.0 + - nightly notifications: email: false branches: @@ -13,6 +14,9 @@ branches: - master - /release-.*/ - /v(\d+)\.(\d+)\.(\d+)/ +matrix: + allow_failures: + - julia: nightly addons: apt: packages: diff --git a/appveyor.yml b/appveyor.yml index 61eddbc6..f3512e18 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,16 +2,15 @@ environment: matrix: - julia_version: 0.7 - julia_version: 1.0 + - julia_version: nightly platform: - 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: From 6619e99e16f531c54edcb6714bdbfc91eba1a067 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 31 Aug 2018 10:05:13 -0700 Subject: [PATCH 4/9] Fix travis config --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c285b8f5..17607a55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,12 +23,12 @@ addons: - xvfb - xauth - libgtk-3-0 -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)' +before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + - sleep 3 # give xvfb some time to start 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"))' From 1cee5b2054ea76e9b14baa3557c23716157b31d4 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 31 Aug 2018 14:38:25 -0700 Subject: [PATCH 5/9] Update travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17607a55..4e99176e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ addons: - xvfb - xauth - libgtk-3-0 -before_script: - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 # give xvfb some time to start +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 '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())' From f29aee5a8c09ef7b04c6682f642c54e10825bc48 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 2 Sep 2018 17:23:29 -0700 Subject: [PATCH 6/9] Update NEWS --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 43974032..be326fe2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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 From 93b8d809c053f1978bc7cf3bad5ca631da64b147 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 3 Sep 2018 11:01:21 -0700 Subject: [PATCH 7/9] Update REQUIRE --- REQUIRE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REQUIRE b/REQUIRE index 0f448557..1798e84c 100644 --- a/REQUIRE +++ b/REQUIRE @@ -2,7 +2,7 @@ julia 0.7 JSON 0.19.0 Requires 0.5.2 NodeJS 0.5.1 -Cairo 0.5.5 +Cairo 0.5.6 Rsvg 0.2.2 IteratorInterfaceExtensions 0.1.1 TableTraits 0.3.1 From 5c4d585440068736810c5508abdca2e783b0976e Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 3 Sep 2018 12:20:30 -0700 Subject: [PATCH 8/9] Disable x86 builds --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f3512e18..a8b3f7ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ environment: - julia_version: nightly platform: - - x86 # 32-bit + # - x86 # 32-bit - x64 # 64-bit matrix: From 1efb46039eefc7d1a00b6a133b03aec3570528b1 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 3 Sep 2018 22:36:11 -0700 Subject: [PATCH 9/9] Update REQUIRE file --- REQUIRE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REQUIRE b/REQUIRE index 1798e84c..3c58d4f6 100644 --- a/REQUIRE +++ b/REQUIRE @@ -7,7 +7,7 @@ Rsvg 0.2.2 IteratorInterfaceExtensions 0.1.1 TableTraits 0.3.1 IterableTables 0.8.3 -FileIO 1.0.0 +FileIO 1.0.1 DataValues 0.4.4 MacroTools 0.4.4 URIParser 0.4.0