Merge pull request #16 from ChevronETC/stk/julia10

more updates for julia 0.7 and 1.0

Author: samtkaplan

.travis.yml

@@ -4,6 +4,7 @@ os:
   - osx
 julia:
   - 0.7
+  - 1.0
   - nightly
 matrix:
   allow_failures:

appveyor.yml

@@ -1,6 +1,10 @@
 environment:
   matrix:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
+    - julia_version: 0.7
+    - julia_version: 1.0
+
+platform:
+    - x64
 
 branches:
   only:
@@ -13,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%"
+

src/TeaSeis.jl

@@ -11,21 +11,23 @@ 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,
 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")
@@ -86,4 +88,8 @@ tracetype,
 leftjustify!,
 regularize!
 
+if VERSION >= v"1.0.0"
+    export ind2sub, sub2ind
+end
+
 end