From f43cf63e613872277937b4fa26200dff6721196a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Thu, 9 May 2019 23:11:01 +0100 Subject: [PATCH] Add Project.toml and remove REQUIRE files --- Project.toml | 22 ++++++++++++++++++++++ REQUIRE | 3 --- deps/build.jl | 5 ++--- test/REQUIRE | 1 - test/nonworking/basic.jl | 1 - test/nonworking/testfunctions.jl | 3 +-- 6 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 Project.toml delete mode 100644 REQUIRE delete mode 100644 test/REQUIRE diff --git a/Project.toml b/Project.toml new file mode 100644 index 0000000..3b34982 --- /dev/null +++ b/Project.toml @@ -0,0 +1,22 @@ +name = "GSL" +uuid = "92c85e6c-cbff-5e0c-80f7-495c94daaecd" +version = "0.5.1" + +[deps] +BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" +Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" + +[compat] +BinaryProvider = "≥ 0.5.2" +SpecialFunctions = "≥ 0.6.0" +julia = "^1.0.0" + +[extras] +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["LinearAlgebra", "Random", "SpecialFunctions", "Test"] diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 41b00ae..0000000 --- a/REQUIRE +++ /dev/null @@ -1,3 +0,0 @@ -julia 1.0 -BinaryProvider v0.5.2 -Compat 1.3.0 diff --git a/deps/build.jl b/deps/build.jl index 0397522..feec7f8 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -2,15 +2,14 @@ # https://github.com/giordano/GSLBuilder.jl using BinaryProvider # requires BinaryProvider 0.3.0 or later -using Compat # Parse some basic command-line arguments const verbose = "--verbose" in ARGS const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr"))) products = [ # work around for https://github.com/JuliaPackaging/BinaryProvider.jl/issues/133 - LibraryProduct(prefix, [Compat.Sys.iswindows() ? "libgsl" : "libgsl."], :libgsl), - LibraryProduct(prefix, [Compat.Sys.iswindows() ? "libgslcblas" : "libgslcblas."], :libgslcblas), + LibraryProduct(prefix, [Sys.iswindows() ? "libgsl" : "libgsl."], :libgsl), + LibraryProduct(prefix, [Sys.iswindows() ? "libgslcblas" : "libgslcblas."], :libgslcblas), ] # Download binaries from hosted location diff --git a/test/REQUIRE b/test/REQUIRE deleted file mode 100644 index 68298f3..0000000 --- a/test/REQUIRE +++ /dev/null @@ -1 +0,0 @@ -SpecialFunctions 0.6.0 diff --git a/test/nonworking/basic.jl b/test/nonworking/basic.jl index 1fe8df7..221071f 100644 --- a/test/nonworking/basic.jl +++ b/test/nonworking/basic.jl @@ -1,5 +1,4 @@ using GSL -using Compat try # Replace with `@isdefined` check on 0.7 diff --git a/test/nonworking/testfunctions.jl b/test/nonworking/testfunctions.jl index 02107ac..ef4e0ff 100644 --- a/test/nonworking/testfunctions.jl +++ b/test/nonworking/testfunctions.jl @@ -1,5 +1,4 @@ -using Compat.Test -using Compat +using Test #Tests GSL special functions and their error-propagating _e variants macro sf_test(sf, args...)