Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,15 @@ language: julia
os:
- linux
julia:
- 0.7
- 1.0
- 1.1
- 1
- nightly
notifications:
email: false
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'using Pkg, LibGit2;
user_regs = joinpath(DEPOT_PATH[1],"registries");
mkpath(user_regs);
all_registries = Dict("General" => "https://github.com/JuliaRegistries/General.git",
"HolyLabRegistry" => "git@github.com:HolyLab/HolyLabRegistry.git");
Base.shred!(LibGit2.CachedCredentials()) do creds
for (reg, url) in all_registries
path = joinpath(user_regs, reg);
LibGit2.with(Pkg.GitTools.clone(url, path; header = "registry $reg from $(repr(url))", credentials = creds)) do repo end
end
end'
- julia -e 'using Pkg; Pkg.build(); Pkg.test("RegisterDriver"; coverage=false)'
- julia -e 'using Pkg; pkg"registry add General https://github.com/HolyLab/HolyLabRegistry.git"'
- julia -e 'using Pkg; Pkg.build(); Pkg.test(;coverage=true)'
after_success:
# update the documentation
- julia -e 'using Pkg; Pkg.add("Documenter")'
Expand Down
22 changes: 16 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
name = "RegisterDriver"
uuid = "935ac36e-2656-11e9-1e3b-cbaa636797af"
authors = ["Tim Holy <tim.holy@gmail.com>"]
version = "0.1.0"
version = "0.2.0"

[deps]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
ImageMetadata = "bc367c6b-8a6b-528e-b4bd-a4b897500b49"
JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
RegisterCore = "67712758-55e7-5c3c-8e85-dda1d7758434"
RegisterWorkerShell = "978d31ce-2656-11e9-22d6-b5c46a1a3d3e"
SharedArrays = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

[compat]
Formatting = "0.4"
HDF5 = "0.12"
ImageCore = "0.8.1"
ImageMetadata = "0.9"
JLD = "0.9"
RegisterCore = "0.2"
RegisterWorkerShell = "0.2"
StaticArrays = "0.11, 0.12"
julia = "1"

[extras]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Compat", "Test", "Pkg"]
test = ["AxisArrays", "Test"]
2 changes: 1 addition & 1 deletion src/RegisterDriver.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module RegisterDriver

using Images, JLD, HDF5, StaticArrays, Formatting, SharedArrays, Distributed
using ImageCore, ImageMetadata, JLD, HDF5, StaticArrays, Formatting, SharedArrays, Distributed
using RegisterCore
using RegisterWorkerShell

Expand Down
1 change: 0 additions & 1 deletion test/WorkerDummy.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module WorkerDummy

using RegisterWorkerShell, Distributed
import RegisterWorkerShell: worker
using Compat

export Alg1, Alg2, Alg3

Expand Down
14 changes: 5 additions & 9 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
using Test, Distributed, SharedArrays
using Images, JLD
using ImageCore, JLD
using RegisterDriver, RegisterWorkerShell
using AxisArrays: AxisArray

driverprocs = addprocs(2)
include("WorkerDummy.jl")
push!(LOAD_PATH, pwd())
@sync for p in driverprocs
@spawnat p eval(quote
using Pkg
Pkg.activate(".")
Pkg.instantiate()
include("WorkerDummy.jl")
end)
@spawnat p push!(LOAD_PATH, pwd())
end
using .WorkerDummy
using WorkerDummy

workdir = tempname()
mkdir(workdir)
Expand Down