Skip to content

Commit 71438cb

Browse files
committed
Merge branch 'main' into continue_cf_conventions
2 parents dab169e + ed15b67 commit 71438cb

38 files changed

+1337
-304
lines changed

.github/workflows/CI.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ on:
33
pull_request:
44
push:
55
branches:
6-
- master
7-
tags: '*'
6+
- main
7+
tags:
8+
- '*'
89
jobs:
910
test:
1011
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -22,7 +23,7 @@ jobs:
2223
arch:
2324
- x64
2425
steps:
25-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v6
2627
- uses: julia-actions/setup-julia@v2
2728
with:
2829
version: ${{ matrix.version }}
@@ -39,10 +40,12 @@ jobs:
3940
${{ runner.os }}-
4041
- uses: julia-actions/julia-buildpkg@v1
4142
- uses: julia-actions/julia-runtest@v1
43+
with:
44+
coverage: true
4245
env:
4346
JULIA_NUM_THREADS: '4'
4447
- uses: julia-actions/julia-processcoverage@v1
4548
- uses: codecov/codecov-action@v5
4649
with:
4750
token: ${{ secrets.CODECOV_TOKEN}}
48-
file: lcov.info
51+
files: lcov.info

.github/workflows/Documenter.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
name: Documenter
44

55
on:
6-
# Runs on pushes targeting the `main` branch. Change this to `master` if you're
7-
# using the `master` branch as the default branch.
6+
# Runs on pushes targeting the `main` branch. Change this to `main` if you're
7+
# using the `main` branch as the default branch.
88
push:
99
branches:
10-
- master
10+
- main
1111
tags: ['*']
1212
pull_request:
1313

@@ -35,7 +35,7 @@ jobs:
3535
DISPLAY: ':0'
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939
- name: Setup Julia
4040
uses: julia-actions/setup-julia@v2
4141
- name: Pull Julia cache

.github/workflows/IntegrationTest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: IntegrationTest
22
on:
33
push:
4-
branches: [master]
4+
branches: [main]
55
tags: [v*]
66
pull_request:
77

@@ -24,14 +24,14 @@ jobs:
2424
- {user: JuliaDataCubes, repo: EarthDataLab.jl}
2525

2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828
- uses: julia-actions/setup-julia@v2
2929
with:
3030
version: ${{ matrix.julia-version }}
3131
arch: x64
3232
- uses: julia-actions/julia-buildpkg@latest
3333
- name: Clone Downstream
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v6
3535
with:
3636
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
3737
path: downstream

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
Benchmark:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
- uses: julia-actions/setup-julia@latest
1212
with:
1313
version: 1

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Changelog
2+
3+
## Unreleased
4+
5+
- DiskArrayEngine integration

Project.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name = "YAXArrays"
22
uuid = "c21b50f5-aa40-41ea-b809-c0f5e47bfa5c"
33
authors = ["Fabian Gans <[email protected]>"]
4-
version = "0.6.1"
4+
version = "0.7.0"
55

66
[deps]
77
CFTime = "179af706-886a-5703-950a-314cd64e0468"
88
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
99
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1010
DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0"
11+
DiskArrayEngine = "2d4b2e14-ccd6-4284-b8b0-2378ace7c126"
1112
DiskArrayTools = "fcd2136c-9f69-4db6-97e5-f31981721d63"
1213
DiskArrays = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
1314
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
@@ -32,14 +33,15 @@ WeightedOnlineStats = "bbac0a1f-7c9d-5672-960b-c6ca726e5d5d"
3233
YAXArrayBase = "90b8fcef-0c2d-428d-9c56-5f86629e9d14"
3334

3435
[compat]
35-
CFTime = "0.0, 0.1"
36-
DataStructures = "0.17, 0.18"
36+
CFTime = "0.0, 0.1, 0.2"
37+
DataStructures = "0.17, 0.18, 0.19"
3738
DimensionalData = "0.27, 0.28, 0.29"
39+
DiskArrayEngine = "0.2"
3840
DiskArrayTools = "0.1.12"
39-
DiskArrays = "0.3, 0.4.10"
41+
DiskArrays = "0.4.18"
4042
DocStringExtensions = "0.8, 0.9"
4143
Glob = "1.3"
42-
Interpolations = "0.12, 0.13, 0.14, 0.15"
44+
Interpolations = "0.12, 0.13, 0.14, 0.15, 0.16"
4345
IntervalSets = "0.3, 0.4, 0.5, 0.6, 0.7"
4446
IterTools = "1"
4547
OffsetArrays = "1"
@@ -55,4 +57,4 @@ StatsBase = "0.32, 0.33, 0.34"
5557
Tables = "0.2, 1.0"
5658
WeightedOnlineStats = "0.3, 0.4, 0.5, 0.6"
5759
YAXArrayBase = "0.7.5"
58-
julia = "1.9"
60+
julia = "1.10"

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/JuliaDataCubes/YAXArrays.jl/blob/main/LICENSE)
44
[![][docs-stable-img]][docs-stable-url][![][docs-dev-img]][docs-dev-url][![DOI][zenodo-img]][zenodo-url][![][ci-img]][ci-url] [![][codecov-img]][codecov-url]
5-
[![Downloads](https://shields.io/endpoint?url=https://pkgs.genieframework.com/api/v1/badge/YAXArrays&label=Downloads)](https://pkgs.genieframework.com?packages=YAXArrays)
65

76
<img src="docs/src/assets/logo.png" align="right" style="padding-left:10px;" width="150"/>
87

@@ -12,7 +11,7 @@
1211
[docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
1312
[docs-stable-url]: https://JuliaDataCubes.github.io/YAXArrays.jl/stable/
1413

15-
[codecov-img]: https://codecov.io/gh/JuliaDataCubes/YAXArrays.jl/branch/master/graph/badge.svg
14+
[codecov-img]: https://codecov.io/gh/JuliaDataCubes/YAXArrays.jl/branch/main/graph/badge.svg
1615
[codecov-url]: https://codecov.io/gh/JuliaDataCubes/YAXArrays.jl
1716

1817
[ci-img]: https://github.com/JuliaDataCubes/YAXArrays.jl/workflows/CI/badge.svg

docs/Project.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@ OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
2626
PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043"
2727
SkipNan = "aed68c70-c8b0-4309-8cd1-d392a74f991a"
2828
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
29+
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
2930
TimeSeries = "9e3dc215-6440-5c97-bce1-76c03772f85e"
3031
WeightedOnlineStats = "bbac0a1f-7c9d-5672-960b-c6ca726e5d5d"
3132
YAXArrayBase = "90b8fcef-0c2d-428d-9c56-5f86629e9d14"
3233
YAXArrays = "c21b50f5-aa40-41ea-b809-c0f5e47bfa5c"
3334
Zarr = "0a941bbe-ad1d-11e8-39d9-ab76183a1d99"
35+
36+
[sources]
37+
YAXArrays = {path = ".."}
38+
39+
[compat]
40+
DocumenterVitepress = "0.2"

docs/make.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ makedocs(; sitename="YAXArrays.jl",
88
checkdocs=:all,
99
format=DocumenterVitepress.MarkdownVitepress(
1010
repo = "github.com/JuliaDataCubes/YAXArrays.jl", # this must be the full URL!
11-
devbranch = "master",
11+
devbranch = "main",
1212
devurl = "dev";
1313
),
1414
draft=false,
@@ -17,10 +17,10 @@ makedocs(; sitename="YAXArrays.jl",
1717
)
1818
# To edit the sidebar, you must edit `docs/src/.vitepress/config.mts`.
1919

20-
deploydocs(;
20+
DocumenterVitepress.deploydocs(;
2121
repo="github.com/JuliaDataCubes/YAXArrays.jl.git", # this must be the full URL!
22-
target="build", # this is where Vitepress stores its output
22+
target=joinpath(@__DIR__, "build"),
2323
branch = "gh-pages",
24-
devbranch="master",
24+
devbranch="main",
2525
push_preview = true
2626
)

docs/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
{
2-
"scripts": {
3-
"docs:dev": "vitepress dev build/.documenter",
4-
"docs:build": "vitepress build build/.documenter",
5-
"docs:preview": "vitepress preview build/.documenter"
6-
},
72
"devDependencies": {
8-
"@nolebase/vitepress-plugin-enhanced-readabilities": "^2.14.0",
3+
"@nolebase/vitepress-plugin-enhanced-readabilities": "^2.15.0",
94
"@types/d3-format": "^3.0.4",
10-
"@types/node": "^22.13.4",
5+
"@types/node": "^22.13.9",
6+
"markdown-it": "^14.1.0",
117
"markdown-it-mathjax3": "^4.3.2",
12-
"rollup-plugin-delete": "^3.0.0",
138
"vitepress": "^1.6.3",
149
"vitepress-plugin-tabs": "^0.6.0"
1510
},
11+
"scripts": {
12+
"docs:dev": "vitepress dev build/.documenter",
13+
"docs:build": "vitepress build build/.documenter",
14+
"docs:preview": "vitepress preview build/.documenter"
15+
},
1616
"dependencies": {
1717
"d3-format": "^3.1.0",
18-
"markdown-it": "^14.1.0",
1918
"markdown-it-footnote": "^4.0.0"
2019
}
2120
}

0 commit comments

Comments
 (0)