diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 8ef088d..bd623f3 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,4 +1,4 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/examples +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: config: - - {os: macOS-latest, r: 'release'} + - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} @@ -29,18 +29,18 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-pandoc@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: rcmdcheck + extra-packages: any::rcmdcheck - - uses: r-lib/actions/check-r-package@v1 + - uses: r-lib/actions/check-r-package@v2 diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 0b26021..5d10623 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -11,6 +11,8 @@ on: name: pkgdown +permissions: read-all + jobs: pkgdown: runs-on: ubuntu-latest @@ -19,8 +21,10 @@ jobs: group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + permissions: + contents: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 @@ -39,8 +43,8 @@ jobs: - name: Deploy to GitHub pages 🚀 if: github.event_name != 'pull_request' - uses: JamesIves/github-pages-deploy-action@4.1.4 + uses: JamesIves/github-pages-deploy-action@v4.5.0 with: clean: false branch: gh-pages - folder: docs + folder: docs \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index e83688a..fe96b9e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: tidync Title: A Tidy Approach to 'NetCDF' Data Exploration and Extraction -Version: 0.3.0.9002 +Version: 0.3.1 Authors@R: c(person("Michael", "Sumner", email = "mdsumner@gmail.com", role = c("aut", "cre")), person("Simon", "Wotherspoon", role = "ctb"), person("Tomas", "Remenyi", role = "ctb"), diff --git a/NAMESPACE b/NAMESPACE index 962bf96..29a1b7b 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -56,4 +56,4 @@ importFrom(stats,setNames) importFrom(tibble,as_tibble) importFrom(utils,head) importFrom(CFtime,CFtime) -importFrom(CFtime,CFtimestamp) +importFrom(CFtime,as_timestamp) diff --git a/R/hyper_transforms.R b/R/hyper_transforms.R index 9e373ce..bb3ebe4 100644 --- a/R/hyper_transforms.R +++ b/R/hyper_transforms.R @@ -94,7 +94,7 @@ hyper_transforms.default <- function(x, all = FALSE, ...) { else calendar <- unlist(dim_atts$value[cal_idx]) try({ cft <- CFtime::CFtime(units, calendar, axis[[1]]) - axis$timestamp = CFtime::CFtimestamp(cft) + axis$timestamp = CFtime::as_timestamp(cft) }, silent = TRUE) }