From 794e5c6b70d4648ea75e5bfe3e388d75c724c0a9 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Fri, 27 Aug 2021 00:34:09 +0200 Subject: [PATCH] Update to Makie 0.15 and AbstractGPs 0.4 and 0.5 --- Project.toml | 6 +- docs/Manifest.toml | 308 +++++++++++++++++++++++++--------------- docs/Project.toml | 4 +- src/conversions.jl | 2 +- src/recipes/gpsample.jl | 2 +- src/recipes/symband.jl | 6 +- test/Project.toml | 4 +- test/conversions.jl | 6 +- 8 files changed, 211 insertions(+), 127 deletions(-) diff --git a/Project.toml b/Project.toml index 606053c..65406c7 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "AbstractGPsMakie" uuid = "7834405d-1089-4985-bd30-732a30b92057" authors = ["David Widmann"] -version = "0.2.1" +version = "0.2.2" [deps] AbstractGPs = "99985d1d-32ba-4be9-9821-2ec096f28918" @@ -9,6 +9,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" [compat] -AbstractGPs = "0.3" -Makie = "0.13, 0.14" +AbstractGPs = "0.3, 0.4, 0.5" +Makie = "0.15.2" julia = "1.3" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index e196488..1982606 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -1,5 +1,10 @@ # This file is machine-generated - editing it directly is not advised +[[ANSIColoredPrinters]] +git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" +uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" +version = "0.0.1" + [[AbstractFFTs]] deps = ["LinearAlgebra"] git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" @@ -7,16 +12,21 @@ uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "1.0.1" [[AbstractGPs]] -deps = ["ChainRulesCore", "Distributions", "FillArrays", "KernelFunctions", "LinearAlgebra", "Random", "RecipesBase", "Reexport", "Statistics", "StatsBase"] -git-tree-sha1 = "d3700bd0201d2ec29c0b18d6f3f971f7072fe491" +deps = ["ChainRulesCore", "Distributions", "FillArrays", "IrrationalConstants", "KernelFunctions", "LinearAlgebra", "Random", "RecipesBase", "Reexport", "Statistics", "StatsBase", "Test"] +git-tree-sha1 = "7c0d3573e745311928819f0fa6a7830799c40892" uuid = "99985d1d-32ba-4be9-9821-2ec096f28918" -version = "0.3.5" +version = "0.5.0" [[AbstractGPsMakie]] deps = ["AbstractGPs", "LinearAlgebra", "Makie"] path = ".." uuid = "7834405d-1089-4985-bd30-732a30b92057" -version = "0.2.0" +version = "0.2.2" + +[[AbstractTrees]] +git-tree-sha1 = "03e0550477d86222521d254b741d470ba17ea0b5" +uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" +version = "0.3.4" [[Adapt]] deps = ["LinearAlgebra"] @@ -35,13 +45,19 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[ArrayInterface]] deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "045ff5e1bc8c6fb1ecb28694abba0a0d55b5f4f5" +git-tree-sha1 = "b6dec2ed4f10840e2cf836508525656450d4d289" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.1.17" +version = "3.1.26" [[Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +[[Automa]] +deps = ["Printf", "ScanByte", "TranscodingStreams"] +git-tree-sha1 = "d50976f217489ce799e366d9561d56a98a30d7fe" +uuid = "67c07d97-cdcb-5c2c-af73-a7f9c32a568b" +version = "0.8.2" + [[AxisAlgorithms]] deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] git-tree-sha1 = "a4d07a1c313392a77042855df46c5f534076fab9" @@ -70,9 +86,9 @@ version = "1.0.5" [[CairoMakie]] deps = ["Base64", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "SHA", "StaticArrays"] -git-tree-sha1 = "441d21d4c75c845d65a472262f545d702afd30df" +git-tree-sha1 = "8664989955daccc90002629aa80193e44893bb45" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -version = "0.6.0" +version = "0.6.5" [[Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] @@ -82,9 +98,9 @@ version = "1.16.1+0" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "d659e42240c2162300b321f05173cab5cc40a5ba" +git-tree-sha1 = "bdc0937269321858ab2a4f288486cb258b9a0af7" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.10.4" +version = "1.3.0" [[ColorBrewer]] deps = ["Colors", "JSON", "Test"] @@ -93,16 +109,16 @@ uuid = "a2cac450-b92f-5266-8821-25eda20663c8" version = "0.4.0" [[ColorSchemes]] -deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] -git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402" +deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random"] +git-tree-sha1 = "9995eb3977fbf67b86d0a0a0508e83017ded03f2" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.12.1" +version = "3.14.0" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "32a2b8af383f11cbb65803883837a149d10dfe8a" +git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.10.12" +version = "0.11.0" [[ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"] @@ -118,18 +134,18 @@ version = "0.12.8" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "e4e2b39db08f967cc1360951f01e8a75ec441cab" +git-tree-sha1 = "727e463cfebd0c7b999bbf3e9e7e16f254b94193" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.30.0" +version = "3.34.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" [[CompositionsBase]] -git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5" +git-tree-sha1 = "455419f7e328a1a2493cabc6428d79e951349769" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" -version = "0.1.0" +version = "0.1.1" [[Contour]] deps = ["StaticArrays"] @@ -138,15 +154,15 @@ uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" version = "0.5.7" [[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" +version = "1.7.0" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677" +git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.9" +version = "0.18.10" [[DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -173,9 +189,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[Distributions]] deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"] -git-tree-sha1 = "013020ec9a5cdf1dd454eba3704dbffa69d3047e" +git-tree-sha1 = "7a58635041e0b5485d56c49d24f10c314841f93c" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.3" +version = "0.25.12" [[DocStringExtensions]] deps = ["LibGit2"] @@ -184,10 +200,10 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.8.5" [[Documenter]] -deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "5acbebf1be22db43589bc5aa1bb5fcc378b17780" +deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] +git-tree-sha1 = "350dced36c11f794c6c4da5dc6493ec894e50c16" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.0" +version = "0.27.5" [[Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] @@ -225,27 +241,27 @@ version = "4.4.0+0" [[FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "ae8de3350af3026008be4ba23e1e905ab2011d20" +git-tree-sha1 = "f985af3b9f4e278b1d24434cbb546d6092fca661" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.4.2" +version = "1.4.3" [[FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "5a0d4b6a22a34d17d53543bd124f4b08ed78e8b0" +git-tree-sha1 = "3676abafff7e4ff07bbd2c42b3d8201f31653dcc" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+7" +version = "3.3.9+8" [[FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "ca36405da56db2f4730b29cd2ad2bf5869baea3c" +git-tree-sha1 = "937c29268e405b6808d958a9ac41bfe1a31b08e7" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.9.1" +version = "1.11.0" [[FillArrays]] -deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "31939159aeb8ffad1d4d8ee44d07f8558273120a" +deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] +git-tree-sha1 = "7c365bdef6380b29cfc5caaf99688cd7489f9b87" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.11.7" +version = "0.12.2" [[FixedPointNumbers]] deps = ["Statistics"] @@ -279,9 +295,9 @@ version = "2.10.4+0" [[FreeTypeAbstraction]] deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics", "StaticArrays"] -git-tree-sha1 = "d51e69f0a2f8a3842bca4183b700cf3d9acce626" +git-tree-sha1 = "19d0f1e234c13bbfd75258e55c52aa1d876115f5" uuid = "663a7486-cb36-511b-a19d-713bb74d65c9" -version = "0.9.1" +version = "0.9.2" [[FriBidi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -290,16 +306,15 @@ uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.10+0" [[Functors]] -deps = ["MacroTools"] -git-tree-sha1 = "a7bb2af991c43dcf5c3455d276dd83976799634f" +git-tree-sha1 = "39007773fd6097164ab537f78d3ac78ad2b8b695" uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -version = "0.2.1" +version = "0.2.4" [[GeometryBasics]] deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "4136b8a5668341e58398bb472754bff4ba0456ff" +git-tree-sha1 = "58bcdf5ebc057b085e58d95c138725628dd7453c" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.3.12" +version = "0.4.1" [[Gettext_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] @@ -309,9 +324,9 @@ version = "0.21.0+0" [[Glib_jll]] deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "47ce50b742921377301e15005c96e979574e130b" +git-tree-sha1 = "7bf67e9a481712b3dbe9cb3dac852dc4b1162e02" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" -version = "2.68.1+0" +version = "2.68.3+0" [[Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -327,9 +342,9 @@ version = "1.3.14+0" [[GridLayoutBase]] deps = ["GeometryBasics", "InteractiveUtils", "Match", "Observables"] -git-tree-sha1 = "db033d75853d0668011f5ab9cc3c4f8977516af9" +git-tree-sha1 = "e2f606c87d09d5187bb6069dab8cee0af7c77bdb" uuid = "3955a311-db13-416c-9275-1d80ed98e5e9" -version = "0.5.4" +version = "0.6.1" [[Grisu]] git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" @@ -355,21 +370,32 @@ version = "0.1.0" [[ImageCore]] deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "8aa4a5c9b0b0a0fea9cac59549222078e375b867" +git-tree-sha1 = "75f7fea2b3601b58f24ee83617b528e57160cbfd" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.9.0" +version = "0.9.1" [[ImageIO]] -deps = ["FileIO", "Netpbm", "PNGFiles", "TiffImages", "UUIDs"] -git-tree-sha1 = "d2b485a4db3d24b58a7558d5e47979c6e9ba1c8e" +deps = ["FileIO", "Netpbm", "OpenEXR", "PNGFiles", "TiffImages", "UUIDs"] +git-tree-sha1 = "13c826abd23931d909e4c5538643d9691f62a617" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" -version = "0.5.5" +version = "0.5.8" + +[[Imath_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "87f7662e03a649cffa2e05bf19c303e168732d3e" +uuid = "905a6f67-0a94-5f89-b386-d35d92009cd1" +version = "3.1.2+0" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" uuid = "9b13fd28-a010-5f03-acff-a1bbcff69959" version = "0.5.1" +[[Inflate]] +git-tree-sha1 = "f5fc07d4e706b84f72d54eedcc1c13d92fb0871c" +uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" +version = "0.1.2" + [[IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "d979e54b71da82f3a65b62553da4fc3d18c9004c" @@ -381,10 +407,10 @@ deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[Interpolations]] -deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "1e0e51692a3a77f1eeb51bf741bdd0439ed210e7" +deps = ["AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] +git-tree-sha1 = "61aa005707ea2cebf47c8d780da8dc9bc4e0c512" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.13.2" +version = "0.13.4" [[IntervalSets]] deps = ["Dates", "EllipsisNotation", "Statistics"] @@ -392,6 +418,11 @@ git-tree-sha1 = "3cc368af3f110a767ac786560045dceddfc16758" uuid = "8197267c-284f-5f27-9208-e0e47529a953" version = "0.5.3" +[[IrrationalConstants]] +git-tree-sha1 = "f76424439413893a832026ca355fe273e93bce94" +uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" +version = "0.1.0" + [[Isoband]] deps = ["isoband_jll"] git-tree-sha1 = "f9b6d97355599074dc867318950adaa6f9946137" @@ -416,9 +447,9 @@ version = "1.3.0" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" +git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.1" +version = "0.21.2" [[KernelDensity]] deps = ["Distributions", "DocStringExtensions", "FFTW", "Interpolations", "StatsBase"] @@ -427,10 +458,10 @@ uuid = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b" version = "0.6.3" [[KernelFunctions]] -deps = ["ChainRulesCore", "Compat", "CompositionsBase", "Distances", "FillArrays", "Functors", "LinearAlgebra", "Random", "Requires", "SpecialFunctions", "StatsBase", "StatsFuns", "TensorCore", "Test", "ZygoteRules"] -git-tree-sha1 = "c7b25bc625ca2ee217021d29e3ddf031967bf0ff" +deps = ["ChainRulesCore", "Compat", "CompositionsBase", "Distances", "FillArrays", "Functors", "IrrationalConstants", "LinearAlgebra", "LogExpFunctions", "Random", "Requires", "SpecialFunctions", "StatsBase", "TensorCore", "Test", "ZygoteRules"] +git-tree-sha1 = "6f46fb7fa868699dfbb6ae7973ba2825d3558ade" uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392" -version = "0.10.5" +version = "0.10.16" [[LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -444,6 +475,11 @@ git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" version = "2.10.1+0" +[[LaTeXStrings]] +git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104" +uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" +version = "1.2.1" + [[LazyArtifacts]] deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" @@ -487,9 +523,9 @@ version = "1.42.0+0" [[Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8d22e127ea9a0917bc98ebd3755c8bd31989381e" +git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.1+0" +version = "1.16.1+1" [[Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -508,10 +544,10 @@ deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[LogExpFunctions]] -deps = ["DocStringExtensions", "LinearAlgebra"] -git-tree-sha1 = "1ba664552f1ef15325e68dc4c05c3ef8c2d5d885" +deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] +git-tree-sha1 = "3d682c07e6dd250ed082f883dc88aee7996bf2cc" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.2.4" +version = "0.3.0" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -524,15 +560,15 @@ version = "2021.1.1+1" [[MacroTools]] deps = ["Markdown", "Random"] -git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0" +git-tree-sha1 = "0fb723cd8c45858c22169b2e42269e53271a6df7" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.6" +version = "0.5.7" [[Makie]] -deps = ["Animations", "Artifacts", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "IntervalSets", "Isoband", "KernelDensity", "LinearAlgebra", "MakieCore", "Markdown", "Match", "Observables", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "Serialization", "Showoff", "SignedDistanceFields", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "UnicodeFun"] -git-tree-sha1 = "7cee23b26d514338759aca2297259e79b692aaa2" +deps = ["Animations", "Base64", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MakieCore", "Markdown", "Match", "MathTeXEngine", "Observables", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "RelocatableFolders", "Serialization", "Showoff", "SignedDistanceFields", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "UnicodeFun"] +git-tree-sha1 = "7e49f989e7c7f50fe55bd92d45329c9cf3f2583d" uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" -version = "0.14.0" +version = "0.15.2" [[MakieCore]] deps = ["Observables"] @@ -541,9 +577,9 @@ uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b" version = "0.1.3" [[MappedArrays]] -git-tree-sha1 = "18d3584eebc861e311a552cbb67723af8edff5de" +git-tree-sha1 = "e8b359ef06ec72e8c030463fe02efe5527ee5142" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.4.0" +version = "0.4.1" [[Markdown]] deps = ["Base64"] @@ -554,15 +590,21 @@ git-tree-sha1 = "5cf525d97caf86d29307150fcba763a64eaa9cbe" uuid = "7eb4fadd-790c-5f42-8a69-bfa0b872bfbf" version = "1.1.0" +[[MathTeXEngine]] +deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "Test"] +git-tree-sha1 = "f5c8789464aed7058107463e5cef53e6ad3f1f3e" +uuid = "0a4f8689-d25c-4efe-a92b-7142dfc1aa53" +version = "0.2.0" + [[MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" [[Missings]] deps = ["DataAPI"] -git-tree-sha1 = "4ea90bd5d3985ae1f9a908bd4500ae88921c5ce7" +git-tree-sha1 = "2ca267b08821e86c5ef4376cffed98a46c2cb205" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "1.0.0" +version = "1.0.1" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" @@ -597,9 +639,9 @@ version = "0.4.0" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "1381a7142eefd4cd12f052a4d2d790fe21bd1d55" +git-tree-sha1 = "c0f4a4836e5f3e0763243b8324200af6d0e0f90c" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.9.2" +version = "1.10.5" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -607,6 +649,18 @@ git-tree-sha1 = "7937eda4681660b4d6aeeecc2f7e1c81c8ee4e2f" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" version = "1.3.5+0" +[[OpenEXR]] +deps = ["Colors", "FileIO", "OpenEXR_jll"] +git-tree-sha1 = "327f53360fdb54df7ecd01e96ef1983536d1e633" +uuid = "52e1d378-f018-4a11-a4be-720524705ac7" +version = "0.3.2" + +[[OpenEXR_jll]] +deps = ["Artifacts", "Imath_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "923319661e9a22712f24596ce81c54fc0366f304" +uuid = "18a262bb-aa17-5467-a713-aee519bc75cb" +version = "3.1.1+0" + [[OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a" @@ -650,15 +704,15 @@ version = "0.3.7" [[Packing]] deps = ["GeometryBasics"] -git-tree-sha1 = "f4049d379326c2c7aa875c702ad19346ecb2b004" +git-tree-sha1 = "1155f6f937fa2b94104162f01fa400e192e4272f" uuid = "19eb6ba3-879d-56ad-ad62-d5c202156566" -version = "0.4.1" +version = "0.4.2" [[PaddedViews]] deps = ["OffsetArrays"] -git-tree-sha1 = "0fa5e78929aebc3f6b56e1a88cf505bb00a354c4" +git-tree-sha1 = "646eed6f6a5d8df6708f15ea7e02a7a2c4fe4800" uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" -version = "0.5.8" +version = "0.5.10" [[Pango_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "FriBidi_jll", "Glib_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -668,9 +722,9 @@ version = "1.47.0+0" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" +git-tree-sha1 = "438d35d2d95ae2c5e8780b330592b6de8494e779" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.1.0" +version = "2.0.3" [[Pixman_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -690,9 +744,9 @@ version = "0.1.1" [[PlotUtils]] deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"] -git-tree-sha1 = "ae9a295ac761f64d8c2ec7f9f24d21eb4ffba34d" +git-tree-sha1 = "c67334c786157d6ef091ce622b365d3d60b1e2c4" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" -version = "1.0.10" +version = "1.0.12" [[PolygonOps]] git-tree-sha1 = "c031d2332c9a8e1c90eca239385815dc271abb22" @@ -730,19 +784,26 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[Ratios]] -git-tree-sha1 = "37d210f612d70f3f7d57d488cb3b6eff56ad4e41" +deps = ["Requires"] +git-tree-sha1 = "7dff99fbc740e2f8228c6878e2aad6d7c2678098" uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.4.0" +version = "0.4.1" [[RecipesBase]] -git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" +git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.1.1" +version = "1.1.2" [[Reexport]] -git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" +git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "1.1.0" +version = "1.2.2" + +[[RelocatableFolders]] +deps = ["SHA", "Scratch"] +git-tree-sha1 = "0529f4188bc8efee85a7e580aca1c7dff6b103f8" +uuid = "05181044-ff0b-4ac5-8273-598c1e38db00" +version = "0.1.0" [[Requires]] deps = ["UUIDs"] @@ -765,6 +826,23 @@ version = "0.3.0+0" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" +[[SIMD]] +git-tree-sha1 = "9ba33637b24341aba594a2783a502760aa0bff04" +uuid = "fdea26ae-647d-5447-a871-4b548cad5224" +version = "3.3.1" + +[[ScanByte]] +deps = ["Libdl", "SIMD"] +git-tree-sha1 = "9cc2955f2a254b18be655a4ee70bc4031b2b189e" +uuid = "7b38b023-a4d7-4c5e-8d43-3f3097f304eb" +version = "0.3.0" + +[[Scratch]] +deps = ["Dates"] +git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda" +uuid = "6c6a2e73-6563-6170-7368-637461726353" +version = "1.1.0" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -789,9 +867,9 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SortingAlgorithms]] deps = ["DataStructures"] -git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96" +git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "1.0.0" +version = "1.0.1" [[SparseArrays]] deps = ["LinearAlgebra", "Random"] @@ -799,9 +877,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] -git-tree-sha1 = "a50550fa3164a8c46747e62063b4d774ac1bcf49" +git-tree-sha1 = "a322a9493e49c5f3a10b50df3aedaf1cdb3244b7" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.5.1" +version = "1.6.1" [[StackViews]] deps = ["OffsetArrays"] @@ -811,15 +889,15 @@ version = "0.1.1" [[Static]] deps = ["IfElse"] -git-tree-sha1 = "2740ea27b66a41f9d213561a04573da5d3823d4b" +git-tree-sha1 = "62701892d172a2fa41a1f829f66d2b0db94a9a63" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "0.2.5" +version = "0.3.0" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "42378d3bab8b4f57aa1ca443821b752850592668" +git-tree-sha1 = "3240808c6d463ac46f1c1cd7638375cd22abbccb" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.2.2" +version = "1.2.12" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -832,21 +910,21 @@ version = "1.0.0" [[StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" +git-tree-sha1 = "fed1ec1e65749c4d96fc20dd13bea72b55457e62" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.8" +version = "0.33.9" [[StatsFuns]] -deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "30cd8c360c54081f806b1ee14d2eecbef3c04c49" +deps = ["IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] +git-tree-sha1 = "20d1bb720b9b27636280f751746ba4abb465f19d" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.9.8" +version = "0.9.9" [[StructArrays]] -deps = ["Adapt", "DataAPI", "Tables"] -git-tree-sha1 = "44b3afd37b17422a62aea25f04c1f7e09ce6b07f" +deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"] +git-tree-sha1 = "1700b86ad59348c0f9f68ddc95117071f947072d" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.5.1" +version = "0.6.1" [[SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] @@ -864,9 +942,9 @@ version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "aa30f8bb63f9ff3f8303a06c604c8500a69aa791" +git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.4.3" +version = "1.5.0" [[Tar]] deps = ["ArgTools", "SHA"] @@ -883,10 +961,16 @@ deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TiffImages]] -deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"] -git-tree-sha1 = "af30d22cc2cdda1848821135bfb04ebd657005a2" +deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "Inflate", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"] +git-tree-sha1 = "03fb246ac6e6b7cb7abac3b3302447d55b43270e" uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" -version = "0.3.2" +version = "0.4.1" + +[[TranscodingStreams]] +deps = ["Random", "Test"] +git-tree-sha1 = "216b95ea110b5972db65aa90f88d8d89dcb8851c" +uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" +version = "0.9.6" [[UUIDs]] deps = ["Random", "SHA"] diff --git a/docs/Project.toml b/docs/Project.toml index 153925e..90cd9e0 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -5,8 +5,8 @@ CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" [compat] -AbstractGPs = "0.3" +AbstractGPs = "0.3, 0.4, 0.5" AbstractGPsMakie = "0.2" -CairoMakie = "0.5, 0.6" +CairoMakie = "0.6" Documenter = "0.27" julia = "1.3" diff --git a/src/conversions.jl b/src/conversions.jl index 9adf897..f0c2375 100644 --- a/src/conversions.jl +++ b/src/conversions.jl @@ -22,7 +22,7 @@ function Makie.convert_arguments( ) y, var = mean_and_var(gp) Δy = bandscale .* sqrt.(var) - return (Point2f0.(x, y .- Δy), Point2f0.(x, y .+ Δy)) + return (Point2f.(x, y .- Δy), Point2f.(x, y .+ Δy)) end # default conversions for `FiniteGP` and `AbstractGP` diff --git a/src/recipes/gpsample.jl b/src/recipes/gpsample.jl index 8df8e98..6343e04 100644 --- a/src/recipes/gpsample.jl +++ b/src/recipes/gpsample.jl @@ -79,7 +79,7 @@ function Makie.plot!(plot::GPSample) # Compute points to plot (NaN required to separate lines) d, n = size(R) - z = fill(Point2f0(NaN32), d + 1, n) + z = fill(Point2f(NaN32), d + 1, n) zflat = reinterpret(Float32, z) # Fill x coordinates diff --git a/src/recipes/symband.jl b/src/recipes/symband.jl index 9d1c690..4a9b8d8 100644 --- a/src/recipes/symband.jl +++ b/src/recipes/symband.jl @@ -26,8 +26,8 @@ function Makie.plot!(plot::SymBand) @extract plot (xy, Δy) lower_upper = lift(xy, Δy, plot.bandscale) do xy, Δy, scale return ( - Point2f0.(first.(xy), last.(xy) .- abs.(scale .* Δy)), - Point2f0.(first.(xy), last.(xy) .+ abs.(scale .* Δy)), + Point2f.(first.(xy), last.(xy) .- abs.(scale .* Δy)), + Point2f.(first.(xy), last.(xy) .+ abs.(scale .* Δy)), ) end lower = lift(first, lower_upper) @@ -60,4 +60,4 @@ function Makie.plot!(plot::SymBand) return plot end -Makie.convert_arguments(::Type{<:SymBand}, x, y, Δy) = (map(Point2f0, x, y), Δy) +Makie.convert_arguments(::Type{<:SymBand}, x, y, Δy) = (map(Point2f, x, y), Δy) diff --git a/test/Project.toml b/test/Project.toml index efd8e75..ff7a284 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -5,6 +5,6 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -AbstractGPs = "0.3" -Makie = "0.13, 0.14" +AbstractGPs = "0.3, 0.4, 0.5" +Makie = "0.15.2" julia = "1.3" diff --git a/test/conversions.jl b/test/conversions.jl index 018794e..3462cd1 100644 --- a/test/conversions.jl +++ b/test/conversions.jl @@ -6,7 +6,7 @@ z = rand(10) # `SymBand` - @test convert_arguments(SymBand, z, f) == (map(Point2f0, z, mu), map(sqrt, var)) + @test convert_arguments(SymBand, z, f) == (map(Point2f, z, mu), map(sqrt, var)) # `GPSample` @test convert_arguments(GPSample, z, f) == (z, f) @@ -20,12 +20,12 @@ lower = mu .- sqrt.(var) upper = mu .+ sqrt.(var) @test convert_arguments(Band, z, f) == - (map(Point2f0, z, lower), map(Point2f0, z, upper)) + (map(Point2f, z, lower), map(Point2f, z, upper)) scale = rand() lower = mu .- scale .* sqrt.(var) upper = mu .+ scale .* sqrt.(var) @test convert_arguments(Band, z, f; bandscale=scale) == - (map(Point2f0, z, lower), map(Point2f0, z, upper)) + (map(Point2f, z, lower), map(Point2f, z, upper)) # Fallback for `AbstractGP` and `FiniteGP` for P in (Lines, LineSegments, Scatter, Band, SymBand, GPSample)