From ef3e7af3292221b3bbbed0f56bff7bcbdadbec8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:05:26 +0000 Subject: [PATCH 1/7] CompatHelper: bump compat for "FFMPEG" to "0.3" --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 39e216b2..4bee59f1 100644 --- a/Project.toml +++ b/Project.toml @@ -32,7 +32,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] Contour = "0.5" -FFMPEG = "0.2" +FFMPEG = "0.2, 0.3" FixedPointNumbers = "0.6, 0.7, 0.8" GR = "0.46" GeometryTypes = "0.7" From df7d28dc995305e5d5e54e550dc12ad4a63f9b44 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Mon, 24 Feb 2020 10:21:23 +0100 Subject: [PATCH 2/7] fix travis and appveyor links in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ed68838c..3c57fef1 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ [docs-img]: https://img.shields.io/badge/docs-stable-blue.svg [docs-url]: http://docs.juliaplots.org/latest/ -[![][travis-img]](travis-url) -[![][appveyor-img]](appveyor-url) +[![][travis-img]][travis-url] +[![][appveyor-img]][appveyor-url] [![][pkgeval-img]][pkgeval-url] [![][gitter-img]][gitter-url] [![][docs-img]][docs-url] From d78bb56316ea7746969b1c1f21a152f2041ebf08 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Tue, 25 Feb 2020 09:40:05 +0100 Subject: [PATCH 3/7] AKWs in HDF5 backend --- src/backends/hdf5.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backends/hdf5.jl b/src/backends/hdf5.jl index 9b357216..07995e17 100644 --- a/src/backends/hdf5.jl +++ b/src/backends/hdf5.jl @@ -109,7 +109,7 @@ _hdf5_datapath(subpath::String) = "$_hdf5_dataroot/$subpath" _hdf5_map_str2telem(k::String) = HDF5PLOT_MAP_STR2TELEM[k] _hdf5_map_str2telem(v::Vector) = HDF5PLOT_MAP_STR2TELEM[v[1]] -function _hdf5_merge!(dest::Dict, src::Dict) +function _hdf5_merge!(dest, src) for (k, v) in src if isa(v, Axis) _hdf5_merge!(dest[k].plotattributes, v.plotattributes) @@ -295,7 +295,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Tuple) end #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple". end -function _hdf5plot_gwrite(grp, k::String, plotattributes::Dict) +function _hdf5plot_gwrite(grp, k::String, plotattributes::AKW) # @warn("Cannot write dict: $k=$plotattributes") end function _hdf5plot_gwrite(grp, k::String, v::AbstractRange) @@ -376,7 +376,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Subplot) _hdf5plot_writetype(grp, Subplot) return end -function _hdf5plot_write(grp, plotattributes::Dict) +function _hdf5plot_write(grp, plotattributes::AKW) for (k, v) in plotattributes kstr = string(k) _hdf5plot_gwrite(grp, kstr, v) @@ -567,7 +567,7 @@ function _hdf5plot_read(grp, k::String) end #Read in values in group to populate plotattributes: -function _hdf5plot_read(grp, plotattributes::Dict) +function _hdf5plot_read(grp, plotattributes::AKW) gnames = names(grp) for k in gnames try From 6e3181375caa67ebc7037a427b0ac86f39aab4d9 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Tue, 25 Feb 2020 10:08:45 +0100 Subject: [PATCH 4/7] bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 4bee59f1..dd117ca6 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Plots" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" author = ["Tom Breloff (@tbreloff)"] -version = "0.29.1" +version = "0.29.2" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" From f69daa8cfe23a78425df27b68a76effd6fbc0523 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2020 15:06:03 +0000 Subject: [PATCH 5/7] CompatHelper: bump compat for "GR" to "0.47" --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index dd117ca6..d233986c 100644 --- a/Project.toml +++ b/Project.toml @@ -34,7 +34,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" Contour = "0.5" FFMPEG = "0.2, 0.3" FixedPointNumbers = "0.6, 0.7, 0.8" -GR = "0.46" +GR = "0.46, 0.47" GeometryTypes = "0.7" JSON = "0.21" Measures = "0.3" From c6593423f5ac4198925b0ac24458ffbcbc2ebd69 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Fri, 28 Feb 2020 09:09:54 +0100 Subject: [PATCH 6/7] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index dd117ca6..d233986c 100644 --- a/Project.toml +++ b/Project.toml @@ -34,7 +34,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" Contour = "0.5" FFMPEG = "0.2, 0.3" FixedPointNumbers = "0.6, 0.7, 0.8" -GR = "0.46" +GR = "0.46, 0.47" GeometryTypes = "0.7" JSON = "0.21" Measures = "0.3" From 4832d870dd880142ddd757446fa7f377af58137a Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 28 Feb 2020 09:27:35 +0100 Subject: [PATCH 7/7] bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index d233986c..46aacdfd 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Plots" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" author = ["Tom Breloff (@tbreloff)"] -version = "0.29.2" +version = "0.29.3" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"