Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add project file and drop pre-1.0 support #7

Merged
merged 1 commit into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ deps/build.log
deps/deps.jl
deps/downloads
deps/usr
deps/src
deps/src
Manifest.toml
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@ language: julia

notifications:
email: false
git:
depth: 99999999

matrix:
include:
- os: linux
julia: 0.6
julia: 1.1
- os: linux
julia: 1.0
- os: osx
julia: 0.6
julia: 1.1
osx_image: xcode9.2
- os: osx
julia: 1.0
Expand All @@ -28,11 +26,9 @@ matrix:
- julia --project=docs/ docs/make.jl
after_success: skip


before_script: # homebrew for mac
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew cask uninstall --force oclint && brew install gcc@8; fi

after_success:
# push coverage results to Coveralls
- julia -e 'VERSION >= v"0.7.0-DEV.5183" && using Pkg; cd(Pkg.dir("FINUFFT")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

- julia -e 'using Pkg; cd(Pkg.dir("FINUFFT")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
21 changes: 21 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name = "FINUFFT"
uuid = "d8beea63-0952-562e-9c6a-8e8ef7364055"
author = "Ludvig af Klinteberg <ludvigak@kth.se>"
version = "0.4.1"

[deps]
BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[compat]
BinDeps = "≥ 0.8.10"
julia = "≥ 1.0.0"

[extras]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "LinearAlgebra", "Random"]
4 changes: 0 additions & 4 deletions REQUIRE

This file was deleted.

2 changes: 1 addition & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using BinDeps
using Compat.Libdl
using Libdl
using Conda

@BinDeps.setup
Expand Down
3 changes: 1 addition & 2 deletions src/FINUFFT.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export nufft_opts
export nufft_c_opts # backward-compability

## External dependencies
using Compat
using Compat.Libdl
using Libdl

const depsfile = joinpath(dirname(@__DIR__), "deps", "deps.jl")
if isfile(depsfile)
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Compat.Test
using Test

@testset "FINUFFT" begin
include("test_error_handler.jl")
Expand Down
3 changes: 1 addition & 2 deletions test/test_error_handler.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using FINUFFT
using Compat.Test
import Compat.@info
using Test

@testset "Error handling" begin

Expand Down
13 changes: 4 additions & 9 deletions test/test_nufft.jl
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
using FINUFFT

# Julia 0.6 compability
using Compat.Test
using Compat.LinearAlgebra
using Compat.Random
using Test
using LinearAlgebra
using Random

if VERSION < v"0.7"
srand(1)
else
Random.seed!(1)
end
Random.seed!(1)

nj = 10
nk = 11
Expand Down