New ncdatasets version (#113)

* bump dependency first, fix breakage later

* fix first instance of using map over dicts

* fix incorrectly used `BaseAttributes`

* also bump DimData.jl again...

* nah wait with DD for now

* fix failing datetime test

* also update dd dependency

* correct version

Author: Datseris

Project.toml

@@ -1,7 +1,7 @@
 name = "ClimateBase"
 uuid = "35604d93-0fb8-4872-9436-495b01d137e2"
 authors = ["Datseris <datseris.george@gmail.com>", "Philippe Roy <borghor@yahoo.ca>"]
-version = "0.17.4"
+version = "0.17.5"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -20,10 +20,10 @@ GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
 ClimateBaseVisualizations = "GeoMakie"
 
 [compat]
-DimensionalData = "0.29"
+DimensionalData = "≥ 0.30"
 GeoMakie = "0.6, 0.7"
 Interpolations = "0.13.2, 0.14, 0.15, 0.16"
-NCDatasets = "0.11, 0.12"
+NCDatasets = "0.14"
 SignalDecomposition = "1.1"
 StaticArrays = "0.12, 1.0"
 Statistics = "1"

src/core/aggregation.jl

@@ -120,6 +120,7 @@ export otheridxs
 
 """
     otheridxs(A::ClimArray, Dim)
+
 Return an iterator of indices, that when used can access all indices of `A` *except* those
 belonging to dimension(s) `Dim`.
 

src/core/coredefs.jl

@@ -2,7 +2,7 @@
 # Basic imports and dimension definitions
 ##########################################################################################
 using DimensionalData
-using DimensionalData.Dimensions, DimensionalData.LookupArrays
+using DimensionalData.Dimensions, DimensionalData.Lookups
 using DimensionalData: basetypeof, broadcast_dims
 using DimensionalData.Dimensions: setdims
 using Dates
@@ -26,7 +26,7 @@ of the given object. Convenience function for quickly getting the numeric data o
 dimensional arrays or dimensions.
 """
 gnv(x) = x
-gnv(x::Union{AbDimArray, LookupArray}) = parent(x)
+gnv(x::Union{AbDimArray, Lookup}) = parent(x)
 gnv(x::Dimension) = parent(parent(x))
 
 export At, (..), Between, Near # Selectors from DimensionalArrays.jl

src/io/netcdf_read.jl

@@ -101,7 +101,7 @@ end
 
 function autodetect_grid(ds)
     if haskey(ds, "reduced_points") || haskey(ds, "clon") ||
-        any(x -> x ∈ ds.dim, POSSIBLE_CELL_NAMES)
+        any(x -> x ∈ keys(ds.dim), POSSIBLE_CELL_NAMES)
         # Common cases of coordinate spaces in NetCDF
         return CoordinateSpace()
     elseif haskey(ds, "lat") && length(size(ds["lat"])) > 1
@@ -157,7 +157,7 @@ function create_dims(ds::NCDatasets.AbstractDataset, dnames, sel = selecteveryth
     end
     optimal_values = vector2range.(dim_values)
     attribs = [
-        (haskey(ds, d) && ds[d].attrib isa NCDatasets.BaseAttributes) ?
+        (haskey(ds, d) && ds[d].attrib isa NCDatasets.CommonDataModel.Attributes) ?
             Dict(ds[d].attrib) :
             Dict()
         for d in dnames

src/io/vector2range.jl

@@ -11,11 +11,11 @@ function vector2range(x::AbstractVector{<:Real})
     return x[1]:dx:x[end]
 end
 
-function vector2range(t::AbstractVector{<:Z}) where {Z<:Dates.AbstractTime}
+function vector2range(t::AbstractVector{<:Dates.AbstractTime})
     tsamp = temporal_sampling(t)
     period = tsamp2period(tsamp)
     isnothing(period) && return t
-    special_format = Z <: NCDatasets.CFTime.AbstractCFDateTime
+    special_format = eltype(t) <: NCDatasets.CFTime.AbstractCFDateTime
     use_base_date = (tsamp == :hourly || special_format)
     ti = use_base_date ? t[1] : Date(t[1])
     tf = use_base_date ? t[end] : Date(t[end])

src/physical_dimensions/spatial_equalarea.jl

@@ -204,7 +204,7 @@ end
 
 # This modifies what happens on A[Coord(Lat(x..y))]
 function DimensionalData.selectindices(c::Coord,
-    sel::Tuple{<:Lat{ <: DimensionalData.LookupArrays.IntervalSets.AbstractInterval}})
+    sel::Tuple{<:Lat{ <: DimensionalData.Lookups.IntervalSets.AbstractInterval}})
     l1 = sel[1].val.left; l2 = sel[1].val.right
     return coord_latitudes_between(gnv(c), l1, l2) # this is Vector{Int}
 end

test/io_tests.jl

@@ -103,7 +103,7 @@ end
         ncwrite("cftime_test.nc", X)
         @test isfile("cftime_test.nc")
         X2 = ncread("cftime_test.nc", "x")
-        @test eltype(dims(X2, Tim)) == DateTime360Day
+        @test eltype(dims(X2, Tim)) <: DateTime360Day
         @test gnv(dims(X2, Tim)) == cfdates
     end