Skip to content

Commit

Permalink
Merge pull request #16 from visr/depwarn
Browse files Browse the repository at this point in the history
final depwarns and update CI
  • Loading branch information
timholy authored Aug 10, 2018
2 parents 8e3a657 + f02a83b commit be9a1c4
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 20 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ os:
- linux
- osx
julia:
- 0.7
- 1.0
- nightly
notifications:
email: false
# uncomment the following lines to override the default test script
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- JULIA_NUM_THREADS=2 julia -e 'Pkg.clone(pwd()); Pkg.build("TiledIteration"); Pkg.test("TiledIteration"; coverage=true)'
- JULIA_NUM_THREADS=2 julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("TiledIteration"); Pkg.test("TiledIteration"; coverage=true)'
after_success:
# push coverage results to Codecov
- julia -e 'cd(Pkg.dir("TiledIteration")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'using Pkg; cd(Pkg.dir("TiledIteration")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
julia 0.7.0-beta.270
julia 0.7
OffsetArrays 0.8
38 changes: 24 additions & 14 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
environment:
matrix:
- 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"
- 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

branches:
only:
Expand All @@ -15,19 +26,18 @@ notifications:
on_build_status_changed: false

install:
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
# 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(), \"TiledIteration\"); Pkg.build(\"TiledIteration\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"TiledIteration\")"
- 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%"
6 changes: 3 additions & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ end
@test_throws BoundsError v[24]
opts = Base.JLOptions()
if opts.can_inline == 1 && opts.check_bounds == 0
@unsafe v[24] = 7
@inbounds v[24] = 7
@test a[25] == 7
@test (@unsafe v[24]) == 7
@test (@inbounds v[24]) == 7
end
@test_throws DimensionMismatch TileBuffer(a, (1:6,1:5))
@test_throws DimensionMismatch TileBuffer(v, (1:5,1:6))
Expand All @@ -213,7 +213,7 @@ end
p = pointer(b)
b = TileBuffer(b, (17:32,1:4))
@test pointer(b) == p
@unsafe begin
@inbounds begin
b[17,2] = 5.2
@test b[17,2] == 5.2
end
Expand Down

0 comments on commit be9a1c4

Please sign in to comment.