From 5a6ff2adfc469fdea788dfffd27a00bcc51b76ea Mon Sep 17 00:00:00 2001 From: Arlo White Date: Wed, 9 Oct 2024 12:23:11 +1000 Subject: [PATCH 1/4] Add CompatHelper suggestions --- Project.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 97b58bf0b..db9e9cad4 100644 --- a/Project.toml +++ b/Project.toml @@ -87,7 +87,7 @@ CpuId = "0.3" DataFrames = "1" DataStructures = "0.18, 0.2" Dates = "1" -DimensionalData = "0.25, 0.26, 0.27" +DimensionalData = "0.25, 0.26, 0.27, 0.28" Distances = "0.10" Distributed = "1" Distributions = "0.25" @@ -97,7 +97,7 @@ GDAL_jll = "301.900.0" GeoDataFrames = "0.3, 0.4" GeoFormatTypes = "0.4" GeoInterface = "1" -GeoMakie = "0.6" +GeoMakie = "0.6, 0.7" GraphMakie = "0.5" Graphs = "1.4, 1.5" HypothesisTests = "0.10, 0.11" @@ -115,6 +115,7 @@ MAT = "0.10" MLJ = "0.19.2, 0.20" Makie = "0.20.8, 0.21" ModelParameters = "0.4" +NetCDF = "0.12" OnlineStats = "1.5" OrderedCollections = "1" PkgVersion = "0.2, 0.3" @@ -138,6 +139,7 @@ Surrogates = "6" TOML = "1" Test = "1" YAXArrays = "0.5" +Zarr = "0.9" julia = "1" [extras] From 31fe933e29d5552c3888ba6caf91004296fbca2d Mon Sep 17 00:00:00 2001 From: Arlo White Date: Wed, 9 Oct 2024 12:28:19 +1000 Subject: [PATCH 2/4] unpin NetCDF and Zarr, add and pin DiskArrays --- Manifest-v1.11.toml | 5 ++--- Project.toml | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Manifest-v1.11.toml b/Manifest-v1.11.toml index 087afa108..85dfec260 100644 --- a/Manifest-v1.11.toml +++ b/Manifest-v1.11.toml @@ -2,7 +2,7 @@ julia_version = "1.11.0" manifest_format = "2.0" -project_hash = "d7b3960efa61322e2915510de223bd9f268aae9a" +project_hash = "dec86e88ac8668ab716bcc986d681b7085c4ae8d" [[deps.ARFFFiles]] deps = ["CategoricalArrays", "Dates", "Parsers", "Tables"] @@ -513,6 +513,7 @@ version = "0.1.10" [[deps.DiskArrays]] deps = ["LRUCache", "OffsetArrays"] git-tree-sha1 = "ef25c513cad08d7ebbed158c91768ae32f308336" +pinned = true uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" version = "0.3.23" @@ -1526,7 +1527,6 @@ version = "0.4.20" [[deps.NetCDF]] deps = ["DiskArrays", "NetCDF_jll"] git-tree-sha1 = "c8ec10c6b72e35f7020b83330f8054908ba454eb" -pinned = true uuid = "30363a11-5582-574a-97bb-aa9a979735b9" version = "0.11.8" @@ -2423,7 +2423,6 @@ version = "0.5.11" [[deps.Zarr]] deps = ["AWSS3", "Blosc", "CodecZlib", "DataStructures", "Dates", "DiskArrays", "HTTP", "JSON", "LRUCache", "OffsetArrays", "OpenSSL", "Pkg", "URIs", "ZipArchives"] git-tree-sha1 = "2b81c3b4ddc0588338a4e5379fc18eeecaae5611" -pinned = true uuid = "0a941bbe-ad1d-11e8-39d9-ab76183a1d99" version = "0.9.3" diff --git a/Project.toml b/Project.toml index db9e9cad4..3fa2dd26f 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,6 @@ name = "ADRIA" uuid = "7dc409a7-fbe5-4c9d-b3e2-b0c19a6ba600" -authors = ["Takuya Iwanaga", "Rose Crocker", "Pedro Ribeiro de Almeida", "Ken Anthony", -"Arlo White", "Daniel Tan", "Benjamin Grier", "Peter Baker"] +authors = ["Takuya Iwanaga", "Rose Crocker", "Pedro Ribeiro de Almeida", "Ken Anthony", "Arlo White", "Daniel Tan", "Benjamin Grier", "Peter Baker"] version = "0.11.0" [deps] @@ -16,6 +15,7 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0" +DiskArrays = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" @@ -88,6 +88,7 @@ DataFrames = "1" DataStructures = "0.18, 0.2" Dates = "1" DimensionalData = "0.25, 0.26, 0.27, 0.28" +DiskArrays = "0.3.23" Distances = "0.10" Distributed = "1" Distributions = "0.25" @@ -115,7 +116,7 @@ MAT = "0.10" MLJ = "0.19.2, 0.20" Makie = "0.20.8, 0.21" ModelParameters = "0.4" -NetCDF = "0.12" +NetCDF = "0.11, 0.12" OnlineStats = "1.5" OrderedCollections = "1" PkgVersion = "0.2, 0.3" From 63fc56f2177dc4d66aea4137e4391474139610d9 Mon Sep 17 00:00:00 2001 From: Arlo White Date: Wed, 9 Oct 2024 12:31:50 +1000 Subject: [PATCH 3/4] update DimensionalData 0.27.9 to 0.28.2 --- Manifest-v1.11.toml | 4 ++-- Manifest.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Manifest-v1.11.toml b/Manifest-v1.11.toml index 85dfec260..8358c34ee 100644 --- a/Manifest-v1.11.toml +++ b/Manifest-v1.11.toml @@ -492,9 +492,9 @@ version = "1.15.1" [[deps.DimensionalData]] deps = ["Adapt", "ArrayInterface", "ConstructionBase", "DataAPI", "Dates", "Extents", "Interfaces", "IntervalSets", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "PrecompileTools", "Random", "RecipesBase", "SparseArrays", "Statistics", "TableTraits", "Tables"] -git-tree-sha1 = "7723a66edfd3bfff65ec510959b6683f8acfb111" +git-tree-sha1 = "cbd9925bb2297608633af59a7f38b764109fe154" uuid = "0703355e-b756-11e9-17c0-8b28908087d0" -version = "0.27.9" +version = "0.28.2" [deps.DimensionalData.extensions] DimensionalDataCategoricalArraysExt = "CategoricalArrays" diff --git a/Manifest.toml b/Manifest.toml index 5543257b9..17e921e68 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.5" manifest_format = "2.0" -project_hash = "c45f4f5a05eb9820ed428bd183dc1084c29981e4" +project_hash = "6b73c0fcd25842bec60d3f0fed2422d18c1a0d2c" [[deps.ARFFFiles]] deps = ["CategoricalArrays", "Dates", "Parsers", "Tables"] @@ -489,9 +489,9 @@ version = "1.15.1" [[deps.DimensionalData]] deps = ["Adapt", "ArrayInterface", "ConstructionBase", "DataAPI", "Dates", "Extents", "Interfaces", "IntervalSets", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "PrecompileTools", "Random", "RecipesBase", "SparseArrays", "Statistics", "TableTraits", "Tables"] -git-tree-sha1 = "7723a66edfd3bfff65ec510959b6683f8acfb111" +git-tree-sha1 = "cbd9925bb2297608633af59a7f38b764109fe154" uuid = "0703355e-b756-11e9-17c0-8b28908087d0" -version = "0.27.9" +version = "0.28.2" [deps.DimensionalData.extensions] DimensionalDataCategoricalArraysExt = "CategoricalArrays" From 563ad87e351eb40aa9a1af071d8ae1cf67a2c9a3 Mon Sep 17 00:00:00 2001 From: Arlo White Date: Wed, 9 Oct 2024 12:43:04 +1000 Subject: [PATCH 4/4] free/pin 1.10 Manifest --- Manifest.toml | 5 ++--- Project.toml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 17e921e68..7ad0a1357 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.5" manifest_format = "2.0" -project_hash = "6b73c0fcd25842bec60d3f0fed2422d18c1a0d2c" +project_hash = "d9c2ea247d858818918b29c559482ae94d458f35" [[deps.ARFFFiles]] deps = ["CategoricalArrays", "Dates", "Parsers", "Tables"] @@ -510,6 +510,7 @@ version = "0.1.10" [[deps.DiskArrays]] deps = ["LRUCache", "OffsetArrays"] git-tree-sha1 = "ef25c513cad08d7ebbed158c91768ae32f308336" +pinned = true uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" version = "0.3.23" @@ -1512,7 +1513,6 @@ version = "0.4.20" [[deps.NetCDF]] deps = ["DiskArrays", "NetCDF_jll"] git-tree-sha1 = "c8ec10c6b72e35f7020b83330f8054908ba454eb" -pinned = true uuid = "30363a11-5582-574a-97bb-aa9a979735b9" version = "0.11.8" @@ -2387,7 +2387,6 @@ version = "0.5.11" [[deps.Zarr]] deps = ["AWSS3", "Blosc", "CodecZlib", "DataStructures", "Dates", "DiskArrays", "HTTP", "JSON", "LRUCache", "OffsetArrays", "OpenSSL", "Pkg", "URIs", "ZipArchives"] git-tree-sha1 = "2b81c3b4ddc0588338a4e5379fc18eeecaae5611" -pinned = true uuid = "0a941bbe-ad1d-11e8-39d9-ab76183a1d99" version = "0.9.3" diff --git a/Project.toml b/Project.toml index 3fa2dd26f..842b17f6c 100644 --- a/Project.toml +++ b/Project.toml @@ -88,7 +88,7 @@ DataFrames = "1" DataStructures = "0.18, 0.2" Dates = "1" DimensionalData = "0.25, 0.26, 0.27, 0.28" -DiskArrays = "0.3.23" +DiskArrays = "=0.3.23" Distances = "0.10" Distributed = "1" Distributions = "0.25"