Skip to content

Commit 34980a1

Browse files
authored
Merge pull request #25 from tanmaykm/tan/julia10
fix for Julia 1.0
2 parents 369a947 + 50b1653 commit 34980a1

File tree

6 files changed

+22
-39
lines changed

6 files changed

+22
-39
lines changed

Project.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
julia 0.7-
1+
julia 0.7-rc3
22
BinaryProvider 0.3

appveyor.yml

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
4-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
3+
- julia_version: 0.7
4+
- julia_version: latest
5+
6+
platform:
7+
- x86
8+
- x64
59

610
## uncomment the following lines to allow failures on nightly julia
711
## (tests will run but not make your overall status red)
812
#matrix:
913
# allow_failures:
10-
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
11-
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
14+
# - julia_version: latest
1215

1316
branches:
1417
only:
15-
- master
16-
- /release-.*/
18+
- /version-.*/
1719

1820
notifications:
1921
- provider: Email
@@ -22,24 +24,18 @@ notifications:
2224
on_build_status_changed: false
2325

2426
install:
25-
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
26-
# If there's a newer build queued for the same PR, cancel this one
27-
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
28-
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
29-
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
30-
throw "There are newer queued builds for this pull request, failing early." }
31-
# Download most recent Julia Windows binary
32-
- ps: (new-object net.webclient).DownloadFile(
33-
$env:JULIA_URL,
34-
"C:\projects\julia-binary.exe")
35-
# Run installer silently, output to C:\projects\julia
36-
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
27+
- ps: |
28+
if (Test-Path env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) {
29+
$ref = $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT
30+
} else {
31+
$ref = $env:APPVEYOR_REPO_BRANCH
32+
}
33+
iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/$ref/bin/install.ps1"))
3734
3835
build_script:
39-
# Need to convert from shallow to complete for Pkg.clone to work
40-
- IF EXIST .git\shallow (git fetch --unshallow)
41-
- C:\projects\julia\bin\julia -e "versioninfo();
42-
Pkg.clone(pwd(), \"Arpack\"); Pkg.build(\"Arpack\")"
36+
- echo "%JL_BUILD_SCRIPT%"
37+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
4338

4439
test_script:
45-
- C:\projects\julia\bin\julia -e "Pkg.test(\"Arpack\")"
40+
- echo "%JL_TEST_SCRIPT%"
41+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

src/Arpack.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,4 @@ function _svds(X; nsv::Int = 6, ritzvec::Bool = true, tol::Float64 = 0.0, maxite
349349
end
350350
end
351351

352-
include("deprecated.jl")
353-
354352
end # module

src/deprecated.jl

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using Arpack
44
using Test, LinearAlgebra, SparseArrays, Random
55

66
@testset "eigs" begin
7-
srand(1234)
7+
Random.seed!(1234)
88
n = 10
99
areal = sprandn(n,n,0.4)
1010
breal = sprandn(n,n,0.4)
@@ -96,7 +96,7 @@ using Test, LinearAlgebra, SparseArrays, Random
9696
end
9797

9898
@testset "Symmetric generalized with singular B" begin
99-
srand(127)
99+
Random.seed!(127)
100100
n = 10
101101
k = 3
102102
A = randn(n,n); A = A'A

0 commit comments

Comments
 (0)