Skip to content

Commit 7e3fdc9

Browse files
DrDaleksararslan
authored andcommitted
Upgrade to 0.7/1.0 (#79)
* Removed precompile and deprecated call to Base.BLAS * Upgrade Travis & Appveyor to 0.7/1.0
1 parent db020d6 commit 7e3fdc9

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ os:
44
- linux
55
- osx
66
julia:
7+
- 0.7
8+
- 1.0
79
- nightly
810
env:
911
matrix:
@@ -16,5 +18,5 @@ notifications:
1618
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
1719
# - julia -e 'Pkg.clone(pwd()); Pkg.build("FFTW"); Pkg.test("FFTW"; coverage=true)'
1820
after_success:
19-
- julia -e 'Pkg.add("Coverage"); cd(Pkg.dir("FFTW")); using Coverage; Coveralls.submit(Coveralls.process_folder())'
20-
- julia -e 'Pkg.add("Documenter"); cd(Pkg.dir("FFTW")); include(joinpath("docs", "make.jl"))'
21+
- julia -e 'using Pkg; Pkg.add("Coverage"); Pkg.dir("FFTW"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
22+
- julia -e 'using Pkg; Pkg.add("Documenter"); Pkg.dir("FFTW"); include(joinpath("docs", "make.jl"))'

appveyor.yml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
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: 1
5+
- julia_version: nightly
6+
7+
platform:
8+
- x86 # 32-bit
9+
- x64 # 64-bit
10+
11+
# # Uncomment the following lines to allow failures on nightly julia
12+
# # (tests will run but not make your overall status red)
13+
# matrix:
14+
# allow_failures:
15+
# - julia_version: latest
516

617
branches:
718
only:
819
- master
20+
- /release-.*/
921

1022
notifications:
1123
- provider: Email
@@ -14,24 +26,18 @@ notifications:
1426
on_build_status_changed: false
1527

1628
install:
17-
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
18-
# If there's a newer build queued for the same PR, cancel this one
19-
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
20-
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
21-
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
22-
throw "There are newer queued builds for this pull request, failing early." }
23-
# Download most recent Julia Windows binary
24-
- ps: (new-object net.webclient).DownloadFile(
25-
$env:JULIA_URL,
26-
"C:\projects\julia-binary.exe")
27-
# Run installer silently, output to C:\projects\julia
28-
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
29+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
2930

3031
build_script:
31-
# Need to convert from shallow to complete for Pkg.clone to work
32-
- IF EXIST .git\shallow (git fetch --unshallow)
33-
- C:\projects\julia\bin\julia -e "versioninfo();
34-
Pkg.clone(pwd(), \"FFTW\"); Pkg.build(\"FFTW\")"
32+
- echo "%JL_BUILD_SCRIPT%"
33+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3534

3635
test_script:
37-
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"FFTW\")"
36+
- echo "%JL_TEST_SCRIPT%"
37+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
38+
39+
# # Uncomment to support code coverage upload. Should only be enabled for packages
40+
# # which would have coverage gaps without running on Windows
41+
# on_success:
42+
# - echo "%JL_CODECOV_SCRIPT%"
43+
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

deps/build.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using LinearAlgebra
2+
13
import Libdl
24
const depsfile = joinpath(@__DIR__, "deps.jl")
35

@@ -15,7 +17,7 @@ else
1517
open(f -> println(f, provider), settings, "w")
1618
end
1719
if provider == "MKL"
18-
if Base.BLAS.vendor() === :mkl
20+
if BLAS.vendor() === :mkl
1921
mklpath = Libdl.dlpath("libmkl_rt")
2022
else
2123
using Conda

src/FFTW.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
__precompile__()
2-
31
module FFTW
42

53
using Compat, LinearAlgebra, Reexport

0 commit comments

Comments
 (0)