Skip to content

Commit 7b79c76

Browse files
committed
Use dirname(@__FILE__) instead of Pkg.dir
this allows installing and loading the package from elsewhere on LOAD_PATH
1 parent c19df15 commit 7b79c76

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/manage_data.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ end
2121

2222
function load_matrix_network_all(name::AbstractString)
2323
A = load_matrix_network(name)
24-
pathname = joinpath(Pkg.dir("MatrixNetworks"),"data")
24+
pathname = joinpath(dirname(dirname(@__FILE__)),"data")
2525

2626
meta_source = joinpath(pathname,"$(name).source")
2727
if isfile(meta_source)
@@ -49,7 +49,7 @@ end
4949

5050

5151
function load_matrix_network(name::AbstractString)
52-
pathname = joinpath(Pkg.dir("MatrixNetworks"),"data")
52+
pathname = joinpath(dirname(dirname(@__FILE__)),"data")
5353
smatfile = joinpath(pathname,"$(name).smat")
5454
if isfile(smatfile)
5555
return readSMAT(smatfile)
@@ -59,7 +59,7 @@ function load_matrix_network(name::AbstractString)
5959
end
6060

6161
function load_matrix_network_metadata(name::AbstractString)
62-
pathname = joinpath(Pkg.dir("MatrixNetworks"),"data")
62+
pathname = joinpath(dirname(dirname(@__FILE__)),"data")
6363
smatfile = joinpath(pathname,"$(name).smat")
6464
meta_xy = joinpath(pathname,"$(name).xy")
6565
meta_labels = joinpath(pathname,"$(name).labels")
@@ -75,7 +75,7 @@ function load_matrix_network_metadata(name::AbstractString)
7575
end
7676

7777
function matrix_network_datasets()
78-
datasets_location = joinpath(Pkg.dir("MatrixNetworks"),"data")
78+
datasets_location = joinpath(dirname(dirname(@__FILE__)),"data")
7979
content = readdir(datasets_location)
8080
smat_files = filter(x->contains(x,".smat"),content)
8181
for i = 1:length(smat_files)

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ all_tests = ["matrixnetwork",
2929

3030
for t in all_tests
3131
test_name = join(["$(t)", "_test",".jl"])
32-
test_path = joinpath(Pkg.dir("MatrixNetworks"), "test", test_name)
32+
test_path = joinpath(dirname(@__FILE__), test_name)
3333
println("running $(test_path) ...")
3434
test_function = include(test_path)
3535
test_function()

0 commit comments

Comments
 (0)