Skip to content
Snippets Groups Projects
Commit 1b576725 authored by François  LAURENT's avatar François LAURENT
Browse files

Merge branch 'dev' into 'main'

Bugfixes for #15, #16 and #17

Closes #17, #16, and #15

See merge request !1
parents eb21ad62 1a6eb2c1
No related branches found
No related tags found
1 merge request!1Bugfixes for #15, #16 and #17
Pipeline #104984 passed
name = "PlanarLarvae" name = "PlanarLarvae"
uuid = "c2615984-ef14-4d40-b148-916c85b43307" uuid = "c2615984-ef14-4d40-b148-916c85b43307"
authors = ["François Laurent", "Institut Pasteur"] authors = ["François Laurent", "Institut Pasteur"]
version = "0.11.1" version = "0.11.2"
[deps] [deps]
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
...@@ -20,6 +20,7 @@ StructTypes = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" ...@@ -20,6 +20,7 @@ StructTypes = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
[compat] [compat]
julia = "1.6" julia = "1.6"
Meshes = "< 0.30.0"
[extras] [extras]
LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3" LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
......
...@@ -1254,7 +1254,7 @@ function getdependencies(run::Run, filepath=nothing) ...@@ -1254,7 +1254,7 @@ function getdependencies(run::Run, filepath=nothing)
deps = String[] deps = String[]
for dep in object_or_array_of_objects(run.attributes[:dependencies]) for dep in object_or_array_of_objects(run.attributes[:dependencies])
datafile = dep[:filename] datafile = dep[:filename]
if !isfile(datafile) if !isnothing(filepath)
dirpath = isdir(filepath) ? filepath : dirname(filepath) dirpath = isdir(filepath) ? filepath : dirname(filepath)
datafile = joinpath(dirpath, datafile) datafile = joinpath(dirpath, datafile)
end end
......
...@@ -689,13 +689,13 @@ The returned array of files can be muted. ...@@ -689,13 +689,13 @@ The returned array of files can be muted.
""" """
find_associated_files(file::String) = find_associated_files(preload(file)) find_associated_files(file::String) = find_associated_files(preload(file))
function find_associated_files(files::Vector{String}) function find_associated_files(files::AbstractVector)
unique(find_associated_files.(files)) do f unique(Iterators.flatmap(find_associated_files, files)) do f
f.source f.source
end end
end end
find_associated_files(file) = PreloadedFile[file] find_associated_files(file::PreloadedFile) = PreloadedFile[file]
function find_associated_files(file::JSONLabels) function find_associated_files(file::JSONLabels)
getdependencies!(file) getdependencies!(file)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment