Merge pull request #9 from queryverse/julia-0.7

davidanthoff · web-flow · commit c964be28050c · 2018-09-06T23:07:09.000-07:00
Update to julia 0.7
diff --git a/.travis.yml b/.travis.yml
@@ -1,34 +1,26 @@
-## Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
-sudo: required
 os:
   - linux
   - osx
 julia:
-  - 0.6
+  - 0.7
+  - 1.0
+  - nightly
 notifications:
   email: false
-git:
-  depth: 99999999
-
-## uncomment the following lines to allow failures on nightly julia
-## (tests will run but not make your overall status red)
-#matrix:
-#  allow_failures:
-#  - julia: nightly
-
-addons:
-  apt:
-    packages:
-    - liblzma-dev
-    - xvfb
-    - xauth
-    - libgtk-3-0
-before_script:
-  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
+branches:
+  only:
+  - master
+  - /release-.*/
+  - /v(\d+)\.(\d+)\.(\d+)/   
+matrix:
+  allow_failures:
+  - julia: nightly
+env:
+  - PYTHON=""
 script:
-  - julia -e 'ENV["PYTHON"]=""; Pkg.clone(pwd()); Pkg.build("Queryverse")'
-  - $TESTCMD -e 'Pkg.test("Queryverse"; coverage=true)'
+  - 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("Queryverse"); Pkg.test("Queryverse"; coverage=true)'
 after_success:
-  # push coverage results to Codecov
   - julia -e 'cd(Pkg.dir("Queryverse")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# Queryverse.jl v0.1.0 Release Notes
+* Drop julia 0.6 support, add julia 0.7/1.0 support
+
 # Queryverse.jl v0.0.2 Release Notes
 * Fix bug in @tee macro
 
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # Queryverse
 
 [![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
-[![Build Status](https://travis-ci.org/davidanthoff/Queryverse.jl.svg?branch=master)](https://travis-ci.org/davidanthoff/Queryverse.jl)
-[![Build status](https://ci.appveyor.com/api/projects/status/361dkbo37skv3s8f/branch/master?svg=true)](https://ci.appveyor.com/project/davidanthoff/queryverse-jl/branch/master)
-[![codecov.io](http://codecov.io/github/davidanthoff/Queryverse.jl/coverage.svg?branch=master)](http://codecov.io/github/davidanthoff/Queryverse.jl?branch=master)
+[![Build Status](https://travis-ci.org/queryverse/Queryverse.jl.svg?branch=master)](https://travis-ci.org/queryverse/Queryverse.jl)
+[![Build status](https://ci.appveyor.com/api/projects/status/4bf4b25hr0b68xbm/branch/master?svg=true)](https://ci.appveyor.com/project/queryverse/queryverse-jl/branch/master)
+[![codecov.io](http://codecov.io/github/queryverse/Queryverse.jl/coverage.svg?branch=master)](http://codecov.io/github/queryverse/Queryverse.jl?branch=master)
 
 ## Overview
 
diff --git a/REQUIRE b/REQUIRE
@@ -1,22 +1,21 @@
-julia 0.6
+julia 0.7
 
-Reexport
+Reexport 0.2.0
 
-DataValues
+DataValues 0.4.4
 
-IterableTables
+IterableTables 0.8.3
 
-Query
+Query 0.10.0
 
-VegaLite
+VegaLite 0.4.0
 
-FileIO
-ExcelFiles
-StatFiles
-CSVFiles
-FeatherFiles
-ParquetFiles
+FileIO 1.0.0
+ExcelFiles 0.6.0
+StatFiles 0.6.1
+CSVFiles 0.9.1
+FeatherFiles 0.5.1
 
-DataFrames
+DataFrames 0.13.1
 
-DataVoyager
+DataVoyager 0.3.0
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,19 +1,22 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - julia_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
 
-## uncomment the following lines to allow failures on nightly julia
-## (tests will run but not make your overall status red)
-#matrix:
-#  allow_failures:
-#  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-#  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+platform:
+  # - x86 # 32-bit
+  - x64 # 64-bit
+
+matrix:
+  allow_failures:
+  - julia_version: nightly
 
 branches:
   only:
     - master
     - /release-.*/
+    - /v(\d+)\.(\d+)\.(\d+)/   
 
 notifications:
   - provider: Email
@@ -22,24 +25,18 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# If there's a newer build queued for the same PR, cancel this one
-  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-        throw "There are newer queued builds for this pull request, failing early." }
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"Queryverse\"); Pkg.build(\"Queryverse\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"Queryverse\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# # Uncomment to support code coverage upload. Should only be enabled for packages
+# # which would have coverage gaps without running on Windows
+# on_success:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
diff --git a/src/Queryverse.jl b/src/Queryverse.jl
@@ -11,7 +11,7 @@ import IterableTables
 @reexport using StatFiles
 @reexport using CSVFiles
 @reexport using FeatherFiles
-@reexport using ParquetFiles
+# @reexport using ParquetFiles
 @reexport using VegaLite
 @reexport using DataVoyager
 
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using Queryverse
-using Base.Test
+using Test
 
 @testset "Queryverse" begin
 
diff --git a/test/testoutput.csv b/test/testoutput.csv
@@ -0,0 +1,3 @@
+"Count","Year"
+23.0,2000
+254.0,2001

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+"Count","Year"`
	`2`	`+23.0,2000`
	`3`	`+254.0,2001`