From 8c26de80af725bf68e1577b41ede1fd3bb08cc53 Mon Sep 17 00:00:00 2001 From: samtkaplan Date: Wed, 5 Sep 2018 06:19:18 -0500 Subject: [PATCH 1/4] Julia 0.7/1.0 no longer has sub2ind and ind2sub methods. --- src/TeaSeis.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TeaSeis.jl b/src/TeaSeis.jl index 3361def..bb66d0a 100644 --- a/src/TeaSeis.jl +++ b/src/TeaSeis.jl @@ -11,14 +11,12 @@ Base.close, Base.empty!, Base.get, Base.in, -Base.ind2sub, Base.isempty, Base.length, Base.ndims, Base.read, Base.read!, Base.sizeof, -Base.sub2ind, Base.write, Base.size, Base.show, @@ -43,6 +41,8 @@ TracePropertyDef, dataproperty, geometry, hasdataproperty, +ind2sub, +sub2ind, jsopen, jscreate, labels, From daa5e7ae72ba0c7f534c664dd020cd7bcf313243 Mon Sep 17 00:00:00 2001 From: samtkaplan Date: Wed, 5 Sep 2018 06:22:02 -0500 Subject: [PATCH 2/4] CI for julia 1.0 --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 90ab15c..b76588c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ os: - osx julia: - 0.7 + - 1.0 - nightly matrix: allow_failures: diff --git a/appveyor.yml b/appveyor.yml index a67ca19..3e05e8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,7 @@ environment: matrix: - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe" + - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-1.0-latest-win64.exe" branches: only: From 2fedeb2c9f74375e125e1eccecbac501368a525c Mon Sep 17 00:00:00 2001 From: samtkaplan Date: Wed, 5 Sep 2018 06:26:55 -0500 Subject: [PATCH 3/4] copy new appveyor script for Example.jl --- appveyor.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3e05e8d..844c761 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,10 @@ environment: matrix: - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe" - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-1.0-latest-win64.exe" + - julia_version: 0.7 + - julia_version: 1.0 + +platform: + - x64 branches: only: @@ -14,24 +17,13 @@ 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(), \"TeaSeis\"); Pkg.build(\"TeaSeis\")" + - echo "%JL_BUILD_SCRIPT%" + - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" test_script: - - C:\projects\julia\bin\julia -e "Pkg.test(\"TeaSeis\")" + - echo "%JL_TEST_SCRIPT%" + - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" + From cefb719550ecad426b4f059be993ede4b8659907 Mon Sep 17 00:00:00 2001 From: samtkaplan Date: Wed, 5 Sep 2018 10:56:54 -0500 Subject: [PATCH 4/4] handle sub2ind,ind2sub correctly for both 0.7 and 1.0. --- src/TeaSeis.jl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/TeaSeis.jl b/src/TeaSeis.jl index bb66d0a..53871f2 100644 --- a/src/TeaSeis.jl +++ b/src/TeaSeis.jl @@ -24,6 +24,10 @@ Base.cp, Base.mv, Base.rm +if VERSION < v"1.0.0" + import Base.ind2sub, Base.sub2ind +end + include("traceproperty.jl") include("dataproperty.jl") include("stockprops.jl") @@ -41,8 +45,6 @@ TracePropertyDef, dataproperty, geometry, hasdataproperty, -ind2sub, -sub2ind, jsopen, jscreate, labels, @@ -86,4 +88,8 @@ tracetype, leftjustify!, regularize! +if VERSION >= v"1.0.0" + export ind2sub, sub2ind +end + end