diff --git a/Project.toml b/Project.toml index 17b614c..34847c9 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "BugReporting" uuid = "bcf9a6e7-4020-453c-b88e-690564246bb8" authors = ["Keno Fischer ", "Tim Besard "] -version = "0.3.5" +version = "0.3.6" [deps] Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6" @@ -26,6 +26,6 @@ JSON = "0.21" ProgressMeter = "1" Scratch = "1" Tar = "1.3.1" -julia = "1.3" +julia = "1.6" rr_jll = "5.3.1" s5cmd_jll = "2.0.0" diff --git a/src/BugReporting.jl b/src/BugReporting.jl index 0b85c12..caee678 100644 --- a/src/BugReporting.jl +++ b/src/BugReporting.jl @@ -569,8 +569,6 @@ function make_interactive_report(report_arg, ARGS=[]) end end -include("sync_compat.jl") - function get_upload_params() # big disclaimer println() @@ -629,7 +627,9 @@ function get_upload_params() end end bind(c, t) - errormonitor(t) + if VERSION >= v"1.7" + errormonitor(t) + end connectionId = try take!(c) catch err @@ -682,9 +682,9 @@ function upload_rr_tarball(tarball, url; access_key_id, secret_access_key, sessi # Upload # TODO: progress bar (peak/s5cmd#51) cmd = `$(s5cmd()) --log error cp $(tarball) $url` - cmd = addenv(cmd, "AWS_ACCESS_KEY_ID" => access_key_id, - "AWS_SECRET_ACCESS_KEY" => secret_access_key, - "AWS_SESSION_TOKEN" => session_token) + cmd = addenv(cmd, "AWS_ACCESS_KEY_ID" => access_key_id, + "AWS_SECRET_ACCESS_KEY" => secret_access_key, + "AWS_SESSION_TOKEN" => session_token) run(cmd) end diff --git a/src/sync_compat.jl b/src/sync_compat.jl deleted file mode 100644 index 73372a0..0000000 --- a/src/sync_compat.jl +++ /dev/null @@ -1,59 +0,0 @@ - -if VERSION < v"1.5.0-DEV.455" - function sync_end(refs) - local c_ex - defined = false - t = current_task() - cond = Threads.Condition() - lock(cond) - nremaining = length(refs) - for r in refs - schedule(Task(()->begin - try - wait(r) - lock(cond) - nremaining -= 1 - nremaining == 0 && notify(cond) - unlock(cond) - catch e - lock(cond) - notify(cond, e; error=true) - unlock(cond) - end - end)) - end - wait(cond) - unlock(cond) - end - - """ - Experimental.@sync - Wait until all lexically-enclosed uses of `@async`, `@spawn`, `@spawnat` and `@distributed` - are complete, or at least one of them has errored. The first exception is immediately - rethrown. It is the responsibility of the user to cancel any still-running operations - during error handling. - !!! Note - This interface is experimental and subject to change or removal without notice. - """ - macro correct_sync(block) - var = esc(sync_varname) - quote - let $var = Any[] - v = $(esc(block)) - sync_end($var) - v - end - end - end -else - macro correct_sync(block) - var = esc(sync_varname) - quote - let $var = Any[] - v = $(esc(block)) - Base.Experimental.sync_end($var) - v - end - end - end -end