Skip to content

Commit

Permalink
Merge pull request #101 from giordano/project-toml
Browse files Browse the repository at this point in the history
Add Project.toml and remove REQUIRE files
  • Loading branch information
ludvigak authored May 12, 2019
2 parents 3102be7 + f43cf63 commit 436eecc
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 10 deletions.
22 changes: 22 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -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"]
3 changes: 0 additions & 3 deletions REQUIRE

This file was deleted.

5 changes: 2 additions & 3 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test/REQUIRE

This file was deleted.

1 change: 0 additions & 1 deletion test/nonworking/basic.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using GSL
using Compat

try
# Replace with `@isdefined` check on 0.7
Expand Down
3 changes: 1 addition & 2 deletions test/nonworking/testfunctions.jl
Original file line number Diff line number Diff line change
@@ -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...)
Expand Down

2 comments on commit 436eecc

@ludvigak
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/694

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.5.1 -m "<description of version>" 436eeccd9d47fc353d678931e0c2ce58365a9a1a
git push origin v0.5.1

Please sign in to comment.