Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply CompatHelper suggestions, free NetCDF,Zarr; add & pin DiskArrays #878

Merged
merged 4 commits into from
Oct 9, 2024
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
9 changes: 4 additions & 5 deletions Manifest-v1.11.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down
9 changes: 4 additions & 5 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.10.5"
manifest_format = "2.0"
project_hash = "c45f4f5a05eb9820ed428bd183dc1084c29981e4"
project_hash = "d9c2ea247d858818918b29c559482ae94d458f35"

[[deps.ARFFFiles]]
deps = ["CategoricalArrays", "Dates", "Parsers", "Tables"]
Expand Down Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down
11 changes: 7 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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"
Expand Down Expand Up @@ -87,7 +87,8 @@ 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"
DiskArrays = "=0.3.23"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this may be redundant with pin? but just to be safe

Distances = "0.10"
Distributed = "1"
Distributions = "0.25"
Expand All @@ -97,7 +98,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"
Expand All @@ -115,6 +116,7 @@ MAT = "0.10"
MLJ = "0.19.2, 0.20"
Makie = "0.20.8, 0.21"
ModelParameters = "0.4"
NetCDF = "0.11, 0.12"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.11 needed to resolve a compatible version with DiskArrays@0.3.23

OnlineStats = "1.5"
OrderedCollections = "1"
PkgVersion = "0.2, 0.3"
Expand All @@ -138,6 +140,7 @@ Surrogates = "6"
TOML = "1"
Test = "1"
YAXArrays = "0.5"
Zarr = "0.9"
julia = "1"

[extras]
Expand Down
Loading