Skip to content

Commit

Permalink
Merge branch 'main' of github.com:JuliaGeo/CommonDataModel.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander-Barth committed Jan 10, 2025
2 parents 23fbd38 + fbc1b02 commit 86a1fce
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/ci.yml → .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@ on:
- pull_request
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
name: Julia ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.6'
- 'lts'
- '1'
os:
- ubuntu-latest
arch:
- x64
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v4
env:
cache-name: cache-artifacts
Expand All @@ -39,7 +36,7 @@ jobs:
- uses: julia-actions/julia-runtest@latest
continue-on-error: ${{ matrix.version == 'nightly' }}
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
file: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keywords = ["netcdf", "GRIB", "climate and forecast conventions", "oceanography"
license = "MIT"
desc = "CommonDataModel is a module that defines types common to NetCDF and GRIB data"
authors = ["Alexander Barth <[email protected]>"]
version = "0.3.6"
version = "0.3.7"

[deps]
CFTime = "179af706-886a-5703-950a-314cd64e0468"
Expand All @@ -21,4 +21,4 @@ Dates = "1"
Preferences = "1.3"
Printf = "1"
Statistics = "1"
julia = "1.6"
julia = "1.6"
4 changes: 2 additions & 2 deletions src/dataset.jl
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function Base.setindex!(ds::AbstractDataset,data::AbstractVariable,varname::Symb
return defVar(ds, varname, data)
end

function Base.keys(ds::AbstractDataset)
function Base.keys(ds::AbstractDataset)
return varnames(ds)
end

Expand Down Expand Up @@ -248,7 +248,7 @@ function Base.getindex(ds::Union{AbstractDataset,AbstractVariable},n::CFStdName)
if length(ncvars) == 1
return ncvars[1]
else
throw(KeyError("$(length(ncvars)) matches while searching for a variable with standard_name attribute equal to $(n.name)"))
throw(KeyError("variable with standard_name attribute equal to $(n.name) ($(length(ncvars)) matches)"))
end
end

Expand Down
2 changes: 1 addition & 1 deletion src/defer.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function metadata(ds::AbstractDataset)
# dimensions

dim = OrderedDict()
unlimited_dims = unlimited(ds.dim)
unlimited_dims = unlimited(ds)

for (dimname,dimlen) in ds.dim
dim[dimname] = Dict(
Expand Down

0 comments on commit 86a1fce

Please sign in to comment.